Bump due to bug 294497.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 103 insertions, 96 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 77794f05b673..52e52f1665f6 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # 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.248 2009/11/13 12:37:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.249 2009/11/25 09:36:04 idl0r Exp $
+
+*bind-9.6.1_p2 (25 Nov 2009)
+*bind-9.4.3_p4 (25 Nov 2009)
+
+  25 Nov 2009; Christian Ruppert <idl0r@gentoo.org> +bind-9.4.3_p4.ebuild,
+  -bind-9.6.1_p1.ebuild, -bind-9.6.1_p1-r1.ebuild, +bind-9.6.1_p2.ebuild:
+  Bump due to bug 294497.
 
   13 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   bind-9.6.1_p1-r1.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index dc8efb492506..c23d5fb13d4b 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 AUX 127.zone 227 RMD160 66ab92f201d71da613702a85806d2e8d27f6516f SHA1 6787635fd44b1f29dc34b31053ca28e4353f69e0 SHA256 65b909fc1398dfa5b532ab395d6920758937093cf7e5b5bec8242dff4fe15e89
 AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626
@@ -21,14 +24,22 @@ AUX named.init-r6 2677 RMD160 034167ae1532b4e1547b57905acca5dadb816da5 SHA1 8221
 AUX named.init-r7 2717 RMD160 fd00883265443b762fa69135579a59cf350c75cd SHA1 340f41e153416d0c444750e5fbe17534cb44e40f SHA256 b10c1607500fccb2e58707c3c197e2bbe4c615bba06748baff34d53cb57bfbad
 DIST bind-9.4.3-P2.tar.gz 6544865 RMD160 89d7c41a8c04833f4427914857f91ffffb0ac5ee SHA1 6ef00b9db269180e4cfa2ea3fe06f7ab9bc7cfa0 SHA256 fb7c9964942ecc07606bb8d4361bf9d9bd8091e059fea1b56e6a0972f99b1ba1
 DIST bind-9.4.3-P3.tar.gz 6544968 RMD160 1e59f48f538141bb5c36fa58607ac4689cb6a161 SHA1 165b3ee52309ae4a483901db6992a979f6382ba7 SHA256 cf1186b9f9bb993053e49f7c9bc22a1f218266cc6112d4e668a56ab8861a2b6d
+DIST bind-9.4.3-P4.tar.gz 6545707 RMD160 e8757d67dbdeb6c0f2c88860214a48c1bd6c8132 SHA1 16686bec02960ba5541852031352acdc12971b7e SHA256 6374354f72a25335ae54799e84f2f0f90b94e8849084ef50709ea8eef8534fc9
 DIST bind-9.5.1-P3.tar.gz 6690806 RMD160 6a929a8860b4e0f4394783023eef8b488ad58af8 SHA1 fa17c60a1e0e95c67b2680f091e46c5677dcb805 SHA256 81dfb6ef4d5b1fc5adb24b4b099cf7fc94c785d04f4c96b634d35ec98758560a
-DIST bind-9.6.1-P1.tar.gz 6601209 RMD160 7421f22f0f30c70ba0324216a4410a2682ecdf1a SHA1 b266511994525b6203af173fd6dda9db58c500a8 SHA256 4a9f7cabd3c674e2ea26ad50396fa6b745b1719ddf1a7d4405faafacb001ea42
+DIST bind-9.6.1-P2.tar.gz 6601674 RMD160 7842404116ec75cd11a73276e9d534bd9ff8c171 SHA1 0169c7898790b72ee3b5a1e090c2bdf68792b952 SHA256 8ad9593ae7ae6903150cfd9202200c26a1caf47816becdd5821b5360d544fc30
 DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a62602 SHA1 fae539a29615fda56a2dcb55a1e01d335835b980 SHA256 afe9cc6a99c20f1dc1929b0a30ff815b0aac509a6c12f8df432853c856d35754
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 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.4.3_p4.ebuild 9210 RMD160 7745b85d9a5451750d8a9a026fb3a1c238e5f7a2 SHA1 965c83312b99917d15e07db4dc118f3a2ad0aa57 SHA256 bad6cd98d3e26f918f41ef1f7609c1aa784a2085d1227aeddcb72279f30d3358
 EBUILD bind-9.5.1_p3.ebuild 9633 RMD160 dcb0cf93b95ef56096a42c2872fc7808526dd366 SHA1 59bbf11afb7047ada25dc51a278022f45d472239 SHA256 072131d7baa0ea499b4a4de3042189a58d1920e48dd04c7e1e6eb88cbe673c4a
-EBUILD bind-9.6.1_p1-r1.ebuild 9252 RMD160 9ecbce4f6728f06a10431f7a900c9495301ddec6 SHA1 d70731b5084b29be1e41b392cabb094a6b24c4f9 SHA256 822bee9822ae7463cc10a069c211873da96c7e3b26358b002e74d0441f773beb
-EBUILD bind-9.6.1_p1.ebuild 9431 RMD160 66e47630c70700850d67822295a8c95186ca0ba6 SHA1 06a12fa4d0401ba5241daf40d4c136902ff9cb81 SHA256 edba82a58eb96590a6baf57bde2fc07e49560b1a8ad1a2015e5693087b57d7f8
-MISC ChangeLog 40235 RMD160 ea819eb94a8db141c5d052f9a412e7bcb879d20e SHA1 f4bbad0d6c9ad12ff982dc72126604f519d55f55 SHA256 fe9f480ffff7ba28191a308c289e32bc9ec981c4ebdc1d64e43c71c9e0399593
+EBUILD bind-9.6.1_p2.ebuild 9242 RMD160 39505eb41800b04ebd10ab418d0d07c22dfbb324 SHA1 10b5594523356aec082a4a1fbd1734cac8e471cc SHA256 373486d29e44e34e1b84ce51be3b8194196ce3d30bebdb6cd2ea98bdd39ac75e
+MISC ChangeLog 40466 RMD160 0a6de24e5b08ffd518a02156fb600339eadb6ea3 SHA1 df7dea670fdac4d8e5acc52028159e76a8a458f8 SHA256 d3cefa07dc4e61ae4cba79d1259e862fbfbfd8c975f4dd735184ca0626616495
 MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksM+p4ACgkQixe2jn+ufTiehACeMmTsfr3hMh+s7sqgUJXXg55o
+3jIAniKvHjMDkWzka4BO2batje56zjgS
+=9Fw4
+-----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.6.1_p1.ebuild b/net-dns/bind/bind-9.4.3_p4.ebuild
index cb4f49d25c67..137d44dad253 100644
--- a/net-dns/bind/bind-9.6.1_p1.ebuild
+++ b/net-dns/bind/bind-9.4.3_p4.ebuild
@@ -1,49 +1,40 @@
 # 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.3 2009/11/12 07:56:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.3_p4.ebuild,v 1.1 2009/11/25 09:36:05 idl0r Exp $
 
-EAPI="2"
+inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
-inherit eutils autotools toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_p1/-P1}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0"
+DLZ_VERSION="9.3.3"
+MY_PV="${PV/_p/-P}"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
-	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${PN}-${MY_PV}.tar.gz
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads
-	resolvconf urandom sdb-ldap xml"
+IUSE="ssl ipv6 doc dlz postgres berkdb mysql odbc ldap selinux idn threads resolvconf urandom"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	mysql? ( >=virtual/mysql-4.0 )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
-	idn? ( net-dns/idnkit )
-	postgres? ( virtual/postgresql-base )
-	threads? ( >=sys-libs/libcap-2.1.0 )
-	xml? ( dev-libs/libxml2 )"
+	idn? ( net-dns/idnkit )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
 	resolvconf? ( net-dns/openresolv )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 pkg_setup() {
 	use threads && {
-		ewarn
+		echo
 		ewarn "If you're in vserver enviroment, you're probably want to"
 		ewarn "disable threads support because of linux capabilities dependency"
-		ewarn
+		echo
 	}
 
 	ebegin "Creating named group and user"
@@ -52,9 +43,9 @@ pkg_setup() {
 	eend ${?}
 }
 
-src_prepare() {
-	# bug 278364 (workaround)
-	epatch "${FILESDIR}/${PN}-9.6.1-parallel.patch"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
 	# Adjusting PATHs in manpages
 	for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
@@ -62,38 +53,37 @@ src_prepare() {
 			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
 			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
 			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}" || die "sed failed, ${i} doesn't exist"
+			"${i}"
 	done
 
 	use dlz && epatch "${FILESDIR}"/${PN}-9.4.0-dlzbdb-close_cursor.patch
 
 	# bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
 	# (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
-	use dlz && use mysql && has_version ">=dev-db/mysql-5" && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+	use dlz && use mysql && epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
 
 	# should be installed by bind-tools
-	sed -i -e "s:nsupdate ::g" bin/Makefile.in || die
-
-	# sdb-ldap patch as per  bug #160567
-	# Upstream URL: http://bind9-ldap.bayour.com/
-	use sdb-ldap && epatch "${WORKDIR}"/sdb-ldap/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+	sed -e "s:nsupdate ::g" -i "${S}"/bin/Makefile.in
 
 	# bug #220361
-	rm {aclocal,libtool}.m4
+	rm "${S}"/aclocal.m4 "${S}"/libtool.m4
 	WANT_AUTOCONF=2.5 AT_NO_RECURSIVE=1 eautoreconf
 
 	# bug #151839
-	sed -i -e \
+	sed -e \
 		's:struct isc_socket {:#undef SO_BSDCOMPAT\n\nstruct isc_socket {:' \
-		lib/isc/unix/socket.c || die
+		-i lib/isc/unix/socket.c
 
 	# remove useless c++ checks
 	epunt_cxx
 }
 
-src_configure() {
+src_compile() {
 	local myconf=""
 
+	use ssl && myconf="${myconf} --with-openssl"
+	use idn && myconf="${myconf} --with-idn"
+
 	use dlz && {
 		myconf="${myconf} --with-dlz-filesystem --with-dlz-stub"
 		use postgres && myconf="${myconf} --with-dlz-postgres"
@@ -105,6 +95,7 @@ src_configure() {
 
 	if use threads; then
 		if use dlz && use mysql; then
+			echo
 			ewarn
 			ewarn "MySQL uses thread local storage in its C api. Thus MySQL"
 			ewarn "requires that each thread of an application execute a MySQL"
@@ -139,74 +130,64 @@ src_configure() {
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
 		--with-libtool \
-		$(use_with ssl openssl) \
-		$(use_with idn) \
-		$(use_enable ipv6) \
-		$(use_with xml libxml2) \
-		${myconf}
+		`use_enable ipv6` \
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "failed to compile bind"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	einstall || die "failed to install bind"
 
-	dodoc CHANGES FAQ KNOWN-DEFECTS README || die
-
-	if use idn; then
-		dodoc README.idnkit || die
-	fi
-
-	if use doc; then
-		dodoc doc/arm/Bv9ARM.pdf || die
+	dodoc CHANGES COPYRIGHT FAQ README
 
+	use doc && {
 		docinto misc
-		dodoc doc/misc/* || die
+		dodoc doc/misc/*
 
-		# might a 'html' useflag make sense?
 		docinto html
-		dohtml -r doc/arm/* || die
+		dohtml doc/arm/*
 
 		docinto	draft
-		dodoc doc/draft/* || die
+		dodoc doc/draft/*
 
 		docinto rfc
-		dodoc doc/rfc/* || die
+		dodoc doc/rfc/*
 
 		docinto contrib
 		dodoc contrib/named-bootconf/named-bootconf.sh \
-			contrib/nanny/nanny.pl || die
+			contrib/nanny/nanny.pl
 
 		# some handy-dandy dynamic dns examples
 		cd "${D}"/usr/share/doc/${PF}
-		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
-	fi
+		tar pjxf ${DISTFILES}/dyndns-samples.tbz2
+	}
 
-	newenvd "${FILESDIR}"/10bind.env 10bind || die
+	newenvd "${FILESDIR}"/10bind.env 10bind
 
+	dodir /etc/bind /var/bind/{pri,sec}
 	keepdir /var/bind/sec
 
-	insinto /etc/bind
-	newins "${FILESDIR}"/named.conf-r3 named.conf || die
+	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 || die
+	insinto /var/bind ; doins "${FILESDIR}"/named.ca
 
 	insinto /var/bind/pri
-	newins "${FILESDIR}"/127.zone-r1 127.zone || die
-	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone || die
+	newins "${FILESDIR}"/127.zone-r1 127.zone
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
 
-	newinitd "${FILESDIR}"/named.init-r6 named || die
-	newconfd "${FILESDIR}"/named.confd-r2 named || die
+	newinitd "${FILESDIR}"/named.init-r5 named
+	newconfd "${FILESDIR}"/named.confd-r2 named
 
-	dosym /var/bind/named.ca /var/bind/root.cache
-	dosym /var/bind/pri /etc/bind/pri
-	dosym /var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/named.ca /var/bind/root.cache
+	dosym ../../var/bind/pri /etc/bind/pri
+	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.1,host.1,nslookup.1,nsupdate.1}
+	rm -f "${D}"/usr/share/man/man8/dnssec-keygen.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() {
@@ -223,7 +204,7 @@ pkg_postinst() {
 	fi
 
 	install -d -o named -g named "${ROOT}"/var/run/named \
-		"${ROOT}"/var/bind/{pri,sec} "${ROOT}"/var/log/named
+		"${ROOT}"/var/bind/pri "${ROOT}"/var/bind/sec
 	chown -R named:named "${ROOT}"/var/bind
 
 	elog "The default zone files are now installed as *.zone,"
@@ -252,13 +233,11 @@ pkg_postinst() {
 	elog "	zone "com" IN { type delegation-only; };"
 	elog "	zone "net" IN { type delegation-only; };"
 
-	ewarn
+	echo
 	ewarn "BIND >=9.2.5 makes the priority argument to MX records mandatory"
 	ewarn "when it was previously optional.  If the priority is missing, BIND"
 	ewarn "won't load the zone file at all."
-	ewarn
-
-	ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
+	echo
 }
 
 pkg_config() {
@@ -273,17 +252,16 @@ pkg_config() {
 
 	if [ ! "$EXISTS" = yes ]; then
 		einfo ; einfon "Setting up the chroot directory..."
-
-		mkdir -m 750 -p ${CHROOT}
-		mkdir -p ${CHROOT}/{dev,proc,etc/bind,var/{run,log}/named,var/bind}
-		chown -R named:named ${CHROOT}
-		chown root:named ${CHROOT}
-
+		mkdir -m 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/{dev,etc,var/run/named}
+		chown -R named:named ${CHROOT}/var/run/named
+		cp -R /etc/bind ${CHROOT}/etc/
 		cp /etc/localtime ${CHROOT}/etc/localtime
-
+		chown named:named ${CHROOT}/etc/bind/rndc.key
+		cp -R /var/bind ${CHROOT}/var/
+		chown -R named:named ${CHROOT}/var/
 		mknod ${CHROOT}/dev/zero c 1 5
 		chmod 666 ${CHROOT}/dev/zero
-
 		if use urandom; then
 			mknod ${CHROOT}/dev/urandom c 1 9
 			chmod 666 ${CHROOT}/dev/urandom
@@ -291,16 +269,27 @@ pkg_config() {
 			mknod ${CHROOT}/dev/random c 1 8
 			chmod 666 ${CHROOT}/dev/random
 		fi
-
+		echo "none    ${CHROOT}/proc    proc    defaults    0 0" >>/etc/fstab
+		mkdir ${CHROOT}/proc
+		mount -t proc none ${CHROOT}/proc
 		if [ -f '/etc/syslog-ng/syslog-ng.conf' ]; then
 			echo "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" >>/etc/syslog-ng/syslog-ng.conf
 		fi
+		chown root:named ${CHROOT}
+		chmod 0750 ${CHROOT}
 
 		grep -q "^#[[:blank:]]\?CHROOT" /etc/conf.d/named ; RETVAL=$?
 		if [ $RETVAL = 0 ]; then
-			sed -i 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named 2>/dev/null
+			sed 's/^# \?\(CHROOT.*\)$/\1/' /etc/conf.d/named > /etc/conf.d/named.orig 2>/dev/null
+			mv --force /etc/conf.d/named.orig /etc/conf.d/named
 		fi
-	else
-		ewarn "NOTE: as of 'bind-9.6.1' the chroot part of the init-script got some major changes."
+
+		sleep 1; echo " Done."; sleep 1
+		einfo
+		einfo "Add the following to your root .bashrc or .bash_profile: "
+		einfo "   alias rndc='rndc -k ${CHROOT}/etc/bind/rndc.key'"
+		einfo "Then do the following: "
+		einfo "   source /root/.bashrc or .bash_profile"
+		einfo
 	fi
 }
diff --git a/net-dns/bind/bind-9.6.1_p1-r1.ebuild b/net-dns/bind/bind-9.6.1_p2.ebuild
index ddeaa44edc2d..cb8d349f4ae6 100644
--- a/net-dns/bind/bind-9.6.1_p1-r1.ebuild
+++ b/net-dns/bind/bind-9.6.1_p2.ebuild
@@ -1,18 +1,18 @@
 # 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-r1.ebuild,v 1.2 2009/11/13 12:37:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.1_p2.ebuild,v 1.1 2009/11/25 09:36:05 idl0r Exp $
 
 EAPI="2"
 
 inherit eutils autotools toolchain-funcs flag-o-matic
 
-MY_PV="${PV/_p1/-P1}"
+MY_PV="${PV/_p/-P}"
 MY_P="${PN}-${MY_PV}"
 
 SDB_LDAP_VER="1.1.0"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="https://www.isc.org/software/bind"
+HOMEPAGE="http://www.isc.org/software/bind"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"