Version bump, #254134

(Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 20 insertions, 17 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 50eb1bac6298..f25001d8cd83 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.218 2009/01/07 19:18:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.219 2009/01/07 19:43:14 dertobi123 Exp $
+
+*bind-9.6.0_p1 (07 Jan 2009)
+*bind-9.5.1_p1 (07 Jan 2009)
+
+  07 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> -bind-9.5.1.ebuild,
+  +bind-9.5.1_p1.ebuild, -bind-9.6.0.ebuild, +bind-9.6.0_p1.ebuild:
+  Version bump, #254134
 
 *bind-9.4.3_p1 (07 Jan 2009)
 
diff --git a/net-dns/bind/bind-9.5.1.ebuild b/net-dns/bind/bind-9.5.1_p1.ebuild
index f6f730f0bb95..ffe0c42b879c 100644
--- a/net-dns/bind/bind-9.5.1.ebuild
+++ b/net-dns/bind/bind-9.5.1_p1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5.1.ebuild,v 1.2 2008/12/28 09:52:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.1_p1.ebuild,v 1.1 2009/01/07 19:43:14 dertobi123 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
+MY_PV="${PV/_p1/-P1}"
 SDB_LDAP_VER="1.1.0"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${PN}-${MY_PV}.tar.gz
 	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
 
@@ -29,6 +30,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
 	resolvconf? ( net-dns/openresolv )"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 pkg_setup() {
 	use threads && {
 		echo
@@ -195,11 +198,6 @@ src_install() {
 	rm -f "${D}"/usr/share/man/man1/{dig.1,host.1,nslookup.1}
 	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen.8,nsupdate.8}
 	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe "${FILESDIR}"/resolvconf.bind bind
-	}
 }
 
 pkg_postinst() {
diff --git a/net-dns/bind/bind-9.6.0.ebuild b/net-dns/bind/bind-9.6.0_p1.ebuild
index 0c628f971850..d50d125341ee 100644
--- a/net-dns/bind/bind-9.6.0.ebuild
+++ b/net-dns/bind/bind-9.6.0_p1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.0.ebuild,v 1.2 2008/12/28 09:52:57 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.6.0_p1.ebuild,v 1.1 2009/01/07 19:43:14 dertobi123 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
+MY_PV="${PV/_p1/-P1}"
 SDB_LDAP_VER="1.1.0"
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9.html"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/${P}.tar.gz
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${PN}-${MY_PV}.tar.gz
 	sdb-ldap? ( mirror://gentoo/bind-sdb-ldap-${SDB_LDAP_VER}.tar.bz2 )
 	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
 
@@ -29,6 +30,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
 	resolvconf? ( net-dns/openresolv )"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
 pkg_setup() {
 	use threads && {
 		echo
@@ -195,11 +198,6 @@ src_install() {
 	rm -f "${D}"/usr/share/man/man1/{dig.1,host.1,nslookup.1}
 	rm -f "${D}"/usr/share/man/man8/{dnssec-keygen.8,nsupdate.8}
 	rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
-
-	use resolvconf && {
-		exeinto /etc/resolvconf/update.d
-		newexe "${FILESDIR}"/resolvconf.bind bind
-	}
 }
 
 pkg_postinst() {