summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-12 07:56:57 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-12 07:56:57 +0000
commit5c03daa4257222db062fb04edb8040e9f2bbfc1e (patch)
treef3a03de001ad72900657cec0980fcb8d8e8e7abc /net-dns
parentAdd missed availible translation. (diff)
downloadhistorical-5c03daa4257222db062fb04edb8040e9f2bbfc1e.tar.gz
historical-5c03daa4257222db062fb04edb8040e9f2bbfc1e.tar.bz2
historical-5c03daa4257222db062fb04edb8040e9f2bbfc1e.zip
Fix collision issues. Per bug #276966 and #282565.
Package-Manager: portage-2.2_rc49/cvs/Linux x86_64
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/bind/ChangeLog5
-rw-r--r--net-dns/bind/Manifest4
-rw-r--r--net-dns/bind/bind-9.6.1_p1.ebuild7
3 files changed, 10 insertions, 6 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 98205661143d..cb5ce5343c6f 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-dns/bind
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.245 2009/08/13 00:41:05 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.246 2009/11/12 07:56:57 scarabeus Exp $
+
+ 12 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> bind-9.6.1_p1.ebuild:
+ Fix collision issues. Per bug #276966 and #282565.
13 Aug 2009; Christian Ruppert <idl0r@gentoo.org> files/named.ca,
files/named.init-r6:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 6c57ed656e56..c3268e9aa150 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -26,6 +26,6 @@ DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d S
EBUILD bind-9.4.3_p2.ebuild 9213 RMD160 1e4d6db34438c0bb9f5996c5429f29e1cf63fd00 SHA1 c21db5b43d12eeb3f9ded54efa8a92df8b9ddfbf SHA256 8c4533cf5656d4268bab787b1b87ca296fbcdd131c28afcc02c47899505cb5f4
EBUILD bind-9.4.3_p3.ebuild 9214 RMD160 98d46b131a300f7c8abcd501feb97a5c45067c73 SHA1 b6949704ec75b8f156b8610fdee078d9c1bef3b6 SHA256 e9c0680d2c1fce0f2e45c0c9269a80c94a1f6d0e22a73d42049c71414632dc2e
EBUILD bind-9.5.1_p3.ebuild 9633 RMD160 dcb0cf93b95ef56096a42c2872fc7808526dd366 SHA1 59bbf11afb7047ada25dc51a278022f45d472239 SHA256 072131d7baa0ea499b4a4de3042189a58d1920e48dd04c7e1e6eb88cbe673c4a
-EBUILD bind-9.6.1_p1.ebuild 9359 RMD160 b19212caf2ee8f3f1e88e8c46e710cf4aa8072b3 SHA1 01369a16a0af25f1d81ba846f073c1c1217381e8 SHA256 4a9c7fe7f1389d2db40b4cce1a013865dba27db7ab990ceccfc6296e21e20c8f
-MISC ChangeLog 39743 RMD160 a7a8f70a6fa468904b3737bc9306aa2e30feb6b3 SHA1 98c458275b9a226c77fbf4e6d2ef1810136002c0 SHA256 36ae326f55f62b1e218ed3c0443ff44cde49aa2f5c0aded21765510a522fb0d3
+EBUILD bind-9.6.1_p1.ebuild 9431 RMD160 66e47630c70700850d67822295a8c95186ca0ba6 SHA1 06a12fa4d0401ba5241daf40d4c136902ff9cb81 SHA256 edba82a58eb96590a6baf57bde2fc07e49560b1a8ad1a2015e5693087b57d7f8
+MISC ChangeLog 39878 RMD160 d389336c520a8bd25194235c0c7b6291f01cce37 SHA1 134afa2561d9aa2af33696d040bf558bc635ca3e SHA256 161257511164dc6af012aa924f945224c7fc44a16a74939c3c02352f53d124d2
MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
diff --git a/net-dns/bind/bind-9.6.1_p1.ebuild b/net-dns/bind/bind-9.6.1_p1.ebuild
index bfabb2df4009..cb4f49d25c67 100644
--- a/net-dns/bind/bind-9.6.1_p1.ebuild
+++ b/net-dns/bind/bind-9.6.1_p1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1_p1.ebuild,v 1.2 2009/07/29 20:20:15 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1_p1.ebuild,v 1.3 2009/11/12 07:56:57 scarabeus Exp $
EAPI="2"
@@ -203,9 +203,10 @@ src_install() {
dosym /var/bind/sec /etc/bind/sec
# Let's get rid of those tools and their manpages since they're provided by bind-tools
- rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1
- rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8
+ rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+ rm -f "${D}"/usr/share/man/man8/{dnssec-keygen,nsupdate}.8*
rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+ rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
}
pkg_postinst() {