closing bug #90429

(Portage version: 2.0.51.20-r4)

4 files changed, 47 insertions, 25 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 6a7bf30bb232..3cb90f00d6fb 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2005/04/25 12:54:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.71 2005/04/26 09:17:52 voxus Exp $
+
+*bind-9.2.5-r3 (26 Apr 2005)
+
+  26 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -bind-9.2.5-r2.ebuild,
+  +bind-9.2.5-r3.ebuild:
+  Fixed mysql path's, closing bug #90429. Also added missing ODBC dependency.
 
   25 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> :
   Stable on ppc.
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 70dbdefbf12a..adbd1cd4cf51 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,28 +1,30 @@
-MD5 2004bd931260a7b138e4ef1784f4a3bd bind-9.2.5-r2.ebuild 7733
-MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
-MD5 28ddeabb8195612197ac2938d39a06d8 ChangeLog 11451
 MD5 23c809afe06852c286f137645287abb4 bind-9.2.2-r3.ebuild 5708
-MD5 64fc49b753eba3d48561cc05d9d284a5 bind-9.3.1-r1.ebuild 6236
 MD5 2bf2f6ce206ebeb1d8d2f1e8bca56ae4 bind-9.2.5.ebuild 7433
-MD5 dca1f666d891ce36c77564bbf7eaeeb4 files/bind-9.2.2-mysql.patch 10993
-MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
-MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
+MD5 bc9537b6bed409b2e8b199484b625283 bind-9.2.5-r3.ebuild 8006
+MD5 64fc49b753eba3d48561cc05d9d284a5 bind-9.3.1-r1.ebuild 6236
+MD5 2004bd931260a7b138e4ef1784f4a3bd bind-9.2.5-r2.ebuild 7733
+MD5 ca671046b5a9f2d293c94d006fa91a70 ChangeLog 11662
+MD5 bf7284c3e31bd3292a01fa046b3220bb metadata.xml 352
+MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
+MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
 MD5 309110e09d923344a34a803f8906fae3 files/digest-bind-9.2.2-r3 121
-MD5 412d666c947769b6015a65a42bb8ea00 files/named.rc6 1434
-MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r2 127
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r3 127
+MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488
 MD5 c46a805da6650356db77b023d4d042d8 files/digest-bind-9.3.1-r1 63
 MD5 4346332cc9681502a3aedfd0a7a1ac41 files/bind-9.2.5-berkdb_fix.patch 537
-MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
-MD5 b3af799ce2505e78a14bb16868cf0593 files/named.conf-r1 758
-MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
-MD5 be5fd752bdbd59385f2a559d603098d5 files/named.conf-r3 1314
 MD5 0eab8a4d5b98b79f76b136ab0dffabcf files/named.rc6-smart_pid_fix 1204
-MD5 e9bb1e01cf0b7597e739e889499ddd7a files/named.conf-r2 768
+MD5 9a06b553558342585f8ba88bd5e4c569 files/bind-9.2.5-mysql.patch 11315
+MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5 127
+MD5 21e3efd21e18f4c660155978105f8ebe files/named.confd 351
 MD5 51197afe8da37b1b453456de90ca4f25 files/127.zone 227
-MD5 51197afe8da37b1b453456de90ca4f25 files/127 227
-MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5-r2 127
-MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
-MD5 a8ffc671392ffacafb5c49ffc1c6a4c6 files/named.rc6-pid_fix 488
 MD5 ccfca63035b534556c3910270d40a4b9 files/localhost 412
-MD5 75d14cac80e71b4ac0662775064c06e2 files/bind-9.2.5-dlz-mysql.patch 11296
-MD5 d47c8a742a2645377ba4d783907700dd files/digest-bind-9.2.5 127
+MD5 b3af799ce2505e78a14bb16868cf0593 files/named.conf-r1 758
+MD5 e9bb1e01cf0b7597e739e889499ddd7a files/named.conf-r2 768
+MD5 be5fd752bdbd59385f2a559d603098d5 files/named.conf-r3 1314
+MD5 ccfca63035b534556c3910270d40a4b9 files/localhost.zone 412
+MD5 dca1f666d891ce36c77564bbf7eaeeb4 files/bind-9.2.2-mysql.patch 10993
+MD5 2bb12cfcd70284e72fbf9e70e5e2974d files/dyndns-samples.tbz2 22866
+MD5 412d666c947769b6015a65a42bb8ea00 files/named.rc6 1434
+MD5 42b5ed5adcee33cf40531d7955412b21 files/10bind.env 27
+MD5 e83e7a76e253debfdd120311fda73fb6 files/named.ca 2518
diff --git a/net-dns/bind/bind-9.2.5-r2.ebuild b/net-dns/bind/bind-9.2.5-r3.ebuild
index 10a8fba250f9..c0f17843da82 100644
--- a/net-dns/bind/bind-9.2.5-r2.ebuild
+++ b/net-dns/bind/bind-9.2.5-r3.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.2.5-r2.ebuild,v 1.2 2005/04/24 09:21:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.5-r3.ebuild,v 1.1 2005/04/26 09:17:52 voxus Exp $
 
 inherit eutils libtool
 
@@ -18,6 +18,7 @@ DEPEND="sys-apps/groff
 	sys-devel/autoconf
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	mysql? ( >=dev-db/mysql-4 )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
@@ -40,10 +41,24 @@ src_unpack() {
 
 	if use bind-mysql; then
 		if use dlz; then
-			epatch ${FILESDIR}/${P}-dlz-mysql.patch
+			MP=${P}-dlz-mysql.patch
 		else
-			epatch ${FILESDIR}/${P}-mysql.patch
+			MP=${P}-mysql.patch
 		fi
+
+		ebegin "Fixing mysql patch"
+		eindent
+
+		cp ${FILESDIR}/${MP} ${T}/${MP}
+
+		sed -e "s:-I/usr/local/include:`mysql_config --include`:" \
+			-e "s:-L/usr/local/lib/mysql -lmysqlclient:`mysql_config --libs`:" \
+			-i ${T}/${MP}
+
+		epatch ${T}/${MP}
+
+		eoutdent
+		eend $?
 	fi
 
 	if use idn; then
@@ -236,4 +251,3 @@ pkg_config() {
 		einfo
 	fi
 }
-
diff --git a/net-dns/bind/files/digest-bind-9.2.5-r2 b/net-dns/bind/files/digest-bind-9.2.5-r3
index 917f82e7d0d6..917f82e7d0d6 100644
--- a/net-dns/bind/files/digest-bind-9.2.5-r2
+++ b/net-dns/bind/files/digest-bind-9.2.5-r3