Add ~x86-fbsd; Add alternativa depend sys-process/fuser-bsd for sys-process/psmisc; Make it include db.h from proper path

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 14 insertions, 17 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 8666c48bf5fc..9ca5db0d72ab 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.363 2011/11/29 16:27:10 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.364 2011/12/06 12:45:32 naota Exp $
+
+  06 Dec 2011; Naohiro Aota <naota@gentoo.org> bind-9.8.1_p1.ebuild:
+  Add ~x86-fbsd; Add alternativa depend sys-process/fuser-bsd for
+  sys-process/psmisc; Make it include db.h from proper path
 
   29 Nov 2011; Tony Vroon <chainsaw@gentoo.org> bind-9.7.3_p3.ebuild,
   bind-9.7.4.ebuild, bind-9.7.4_p1.ebuild:
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index fed629a61973..67deafc60133 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626
 AUX bind-9.7.3-odbc-dlz-detect.patch 517 RMD160 2103729c77088500c9640206b4aa0fd3888e0555 SHA1 28ab80dfe8f9d65d52fbf3f8b33a7522388d526a SHA256 69797543bf723e3e3e7405f0130d14754ad26830d45977efebdd35848b7b03aa
@@ -26,13 +23,6 @@ EBUILD bind-9.7.3_p3.ebuild 11549 RMD160 d8773e17b340f6d73589ede19fd1ed04fb20716
 EBUILD bind-9.7.4.ebuild 11562 RMD160 1a943a31178572ddd376f52189c44e750827a963 SHA1 edfa3b98fcd29050a50f6c4c83cff7cce248cd4e SHA256 a90e6483a9cedde9487f1873535d1f263632ea7ba4573fc60b709266b86f7893
 EBUILD bind-9.7.4_p1.ebuild 11516 RMD160 47a013fd2a78d79ad573429985f5cfb883aa21ab SHA1 488c3c87bd950e9966139ae2b1358347cb2c518c SHA256 d16b97d8248c6bd9729c5136cc5147653e882012d54cf9553dd3a96f3d62454d
 EBUILD bind-9.8.1.ebuild 11826 RMD160 a6ad80de98e1335da7bdeb580d3509145f169e3d SHA1 d9d0097b4ef8e728b8ead39ec408cd732b899890 SHA256 507f3d861dc0e72e8c57883af3f88524b8cd67b02a74c570f850391704af33b7
-EBUILD bind-9.8.1_p1.ebuild 11729 RMD160 e3f78a3595c8664ff2412ba90952a20ce10114b4 SHA1 23b4f50ac426092946ab25ee5a85ca0fddabf932 SHA256 6cdf2d1b80b6fca0f57769f97ed253b7ea7612c3b209dc6a5e03f0e5b5343910
-MISC ChangeLog 61497 RMD160 c854a2231e3cc3256e77cd9c5feff6226c0222b6 SHA1 75d67757eee8b732cbf12151ae37a3de3584e79a SHA256 06f3c44f27969984e815678d101a25fccfb904c1788f3f78f9ce9d60e7a93392
+EBUILD bind-9.8.1_p1.ebuild 11861 RMD160 0eea330017d0aef8188a02846b2fb019cc9de288 SHA1 8f6cb39ef3a1dd4cc8eeba10c1352d20f4d8ae31 SHA256 6c8601ff3307e0e418a634ff6915d8f2e3397e648efa96667bf17c9e106cfebd
+MISC ChangeLog 61690 RMD160 647faa1baffbc252965533d748fbea6ebd5a7fd8 SHA1 b74910ae9422b37777491dd3c3ca78fedeca00d2 SHA256 9b6e858b431d31b460c82d5c2c74a44d716dc54b767b4c2f2bfb86b43b382a6c
 MISC metadata.xml 887 RMD160 3c0fdcaacc812fc3e558afbbdb91dd6efbf377f9 SHA1 73e55d5772ca66d165643bf389847234c32593d7 SHA256 c0a53163775c42b68ed319c68f18234d8e6d908b318066a0d533bf7bcd40ce7c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7VB/YACgkQp5vW4rUFj5p1JwCbBHeVVqo7okcwpkNG0fwlNxXf
-fdkAoIFbaGxYvQxmd9c2gqB7I/wwfkBY
-=z646
------END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.8.1_p1.ebuild b/net-dns/bind/bind-9.8.1_p1.ebuild
index e3bdc3fdb058..bdf0c6d3eded 100644
--- a/net-dns/bind/bind-9.8.1_p1.ebuild
+++ b/net-dns/bind/bind-9.8.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1_p1.ebuild,v 1.2 2011/11/17 18:12:20 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.1_p1.ebuild,v 1.3 2011/12/06 12:45:32 naota Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -13,7 +13,7 @@
 
 EAPI="4"
 
-inherit eutils autotools toolchain-funcs flag-o-matic multilib
+inherit eutils autotools toolchain-funcs flag-o-matic multilib db-use
 
 MY_PV="${PV/_p/-P}"
 MY_PV="${MY_PV/_rc/rc}"
@@ -40,7 +40,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="berkdb caps dlz doc geoip gost gssapi idn ipv6 ldap mysql odbc pkcs11 postgres rpz sdb-ldap
 selinux ssl threads urandom xml"
 
@@ -67,7 +67,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
-	sys-process/psmisc"
+	|| ( sys-process/psmisc sys-process/fuser-bsd )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -140,6 +140,9 @@ src_configure() {
 	# bug #158664
 #	gcc-specs-ssp && replace-flags -O[23s] -O
 
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
 	export BUILD_CC=$(tc-getBUILD_CC)
 	econf \
 		--sysconfdir=/etc/bind \