Fix AR calls, bug 440338. Fix LICENSE, bug 440752.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 23 insertions, 14 deletions

diff --git a/net-dns/bind-tools/ChangeLog b/net-dns/bind-tools/ChangeLog
index eca70dcd762c..0f43d3fcfe78 100644
--- a/net-dns/bind-tools/ChangeLog
+++ b/net-dns/bind-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.229 2012/11/01 06:29:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/ChangeLog,v 1.230 2012/11/01 18:58:04 idl0r Exp $
+
+  01 Nov 2012; Christian Ruppert <idl0r@gentoo.org> bind-tools-9.9.2.ebuild,
+  metadata.xml:
+  Fix AR calls, bug 440338. Fix LICENSE, bug 440752.
 
   01 Nov 2012; Jeroen Roovers <jer@gentoo.org> bind-tools-9.9.2.ebuild:
   Stable for HPPA (bug #440318).
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index fccd56ca31f6..3bae675f9ee9 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -8,13 +8,17 @@ DIST bind-9.9.1-P4.tar.gz 7227655 SHA256 18f90727fd9566da037e71569d9b3a4834c96b0
 DIST bind-9.9.2.tar.gz 7285050 SHA256 7e6530b198d512e27a856bbd7426b1a3c47fd55d06d667adb66f760259009b48 SHA512 a64eec10ba69d1bc97524bdf003a3fc3721b0879e128b58fe1e8e181165cd613e7f9492f9a1dfab7a4e689adf743db70e85ec2bce4220ce8203e5fdb478e92f4 WHIRLPOOL cffc59ab3a0cc1113183e85d9b543f4b1d183b181d9b5ab5caea6698645adf919fc84a3b8820cd6d54ef3cb98a008f950e7599f685adbf516da17deb043d9ad8
 EBUILD bind-tools-9.9.1_p2.ebuild 2328 SHA256 96c8c8d3492055f90ed6464aa728f0f22ed1e3d2500af7abd995573358cd4b5c SHA512 83c26b7467fe5205a4ca0a3a6f16e145c207bee32d9455a1b752bc1225f145f36f2cd2ee9aa5a9e0b2cb2698f4c3c0f7caf497a006f15714372242a816142a29 WHIRLPOOL 01296748d1719f41ffe5d88a065023d2ddaf5dae754fc902766789115e9355aba3708d5ae2107910fd5fbe02bb66c040dd78400a004a96b0fc3cffd128da652c
 EBUILD bind-tools-9.9.1_p4.ebuild 2531 SHA256 535785a7e3e5071eb6a34bd42342145633c94109bcc64a989ca8065127db996f SHA512 a3bc68960ff08a5a1d1f68e9cf669a65c98f1211dce9f26bdc65ba720e1dc058bf2355d1cda3d2e3d3f6134f6bd11d14e11ce8fb1a4eb0b77cc397dad26a4674 WHIRLPOOL 1d8191cde4064ea79e46bf000ae45797ec3e60ec6a9ffc0be31af5a637d34e61aa781bccac04b50cd120f16596f0cf98249b90af764e88d0f1ab435385d73da0
-EBUILD bind-tools-9.9.2.ebuild 2481 SHA256 a290bcc248381e94512d4afc6d17938f224c335555d1572ac79e70f3ee2d20d2 SHA512 b225e37a4401dd2a265887b7628b12b8682629657e6958cd8d7250e0f1d41e449ef3f37ddcecc2f4d802c90fb42dc5ee416b5d79329ad2875587185e41294afd WHIRLPOOL fb8c9ebf7388a1625c872e118e4bbe48ce18f302986108b2bd21c2bd2a30e8ff3029f5011d922958aedde2a2cfe2cde22a5cce1fc3a11e2692986cceb6d802cc
-MISC ChangeLog 34091 SHA256 40b6ef79af40103cafe5d0b9ebddd66efbc5269df24d0ce2d0bfd1c2c19210a6 SHA512 5919cd52ba80cac5d3ff55ab8e3d8457ffb3c0c490398faa5105e6c80cc5e0526dc1e5ba75ca3fa47f7049e7a3d6876905841bf6b86d0e9376fdfa8138fe48eb WHIRLPOOL 52d2128d561e065861606bc9ff82d9a0de594c4b94ccb7c4c07ed6a9e388392608adecc0e6fc2ad38bcd1138d073f8515cc3c64d1633c02981f723e784d9b2ba
-MISC metadata.xml 509 SHA256 6f1defc80a2d3e4c3abdf2f630c7575c17a4aa35a694338122642c6ab57a5fb5 SHA512 6b1790e9628a99fb89c51e5657d4529c5c3470f0e3f3b7f2a5b3d1df6b703ab0a3b7c7932270830669ba2d0f95b83b119f4d24748f7c6feabab43c1479211d94 WHIRLPOOL 398ab2b8a5e12573b006ed7c89714db8da12f228c4ae6adfb9836d4e4ee10c9c09ce09ab20aff829e94a4e5ec90b5a906f45ade7bc8832d92ad4782ca34eeaaf
+EBUILD bind-tools-9.9.2.ebuild 2571 SHA256 fa3d2bb72f651100491d1ce3cc3607cd772f3d72f053a9725e7e7c8e633c3589 SHA512 2b1e042c4b242cf8435c1ecd573faadee3317ebb03199c3bb82839be087d9c88c97edad2b0af68dc084e26bba23e2638d67930c19d9877f65ced72bb32584a28 WHIRLPOOL 6b54d8083786053424cee31cf2f1064d732bc3f40aced18af0a191e98f6bfb4d2e83f0e555cfa1df0762733d9dc3f9c2915b9e1f670ad46ae4ae32b4c0b91320
+MISC ChangeLog 34240 SHA256 f14900b2ce4eb5c16aff121ef9e16eee8e9b182f943f39f968b82292e51007b7 SHA512 9016b35f94436b26318087bf99f1738da773727accaf48ded3229ae3f5665290616c533b2bb914c4c390e3dbe47a180ecf42653722eb8ec083e7ba113d509279 WHIRLPOOL 67084fb104f493a11b91ccaa890ce250c8a95cc9d980075461adbfac69f5ab9e19e94c9df2495ae2edef856e0cc7478748c4a30f0e2ab041d5ecebd875037602
+MISC metadata.xml 436 SHA256 b1fe05e5e2145121dbc7105242c183175fbaecc32976438ce235587a003f81a1 SHA512 dad8b2161c5e6f76cca7ff82a21e3d3a25e0bfb491337094fbd523542f06d3a349a4ccc691b6eb52c60e2b198eb916c28eba178cf8e9825ef892852c56a0c352 WHIRLPOOL 8e45fbf1cab09aaf6743441e078c178cd6373b8aaa8eadca9eacae00e366af823c69b260748d3d2583339431b848d3d6f82127197166236d4479317877c5003c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCSFt4ACgkQVWmRsqeSphOyXACfRuxKlEhSnhk8JesPWq8RlWWX
-1moAmQEt5YTNDR6y8rw7B5pgX/kGPt8k
-=4vhr
+iQEcBAEBCAAGBQJQksZHAAoJEMOx0zmdw4Z1BU4H/iOwX1n4V5uniJ/ZFzBJx63a
+0nNxWiKahZql4zZ3C8urivK7Mjv72fNICjxI4pRlmS8q400j++m8ZYre0TtyE9uQ
+euGF3g2mOYJUDiKcIvvX4PDHV8FNX0QMy85nVPFaedcMRhw7pjLys1VEoLD1pTZj
+WbpgiAzhGz/Hnj1j9q/WFZyBzFIwwr2KpaIHvlwjESUZ0DR+TqED2IqGA58M9i5y
+2En3016+9x0572rYelUd6ukZJN0oyfv7BAmS/D2FSpqJaa/AIKoUUvf+msKI5EAH
+yBMDTxmhVBLRXCsMN1j2E5YjU6fCDmVseuJ++JgI49h0HAajsKZYf6r1Q75ji4c=
+=o7Rx
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind-tools/bind-tools-9.9.2.ebuild b/net-dns/bind-tools/bind-tools-9.9.2.ebuild
index fca8623b1dbb..fbd5e2286af6 100644
--- a/net-dns/bind-tools/bind-tools-9.9.2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.2.ebuild,v 1.4 2012/11/01 06:29:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.9.2.ebuild,v 1.5 2012/11/01 18:58:04 idl0r Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
 HOMEPAGE="http://www.isc.org/software/bind"
 SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="ISC BSD BSD-2 HPND JNIC RSA-PKCS11 openssl"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gssapi idn ipv6 readline ssl urandom xml"
@@ -72,10 +72,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C lib/ || die "emake lib failed"
-	emake -C bin/dig/ || die "emake bin/dig failed"
-	emake -C bin/nsupdate/ || die "emake bin/nsupdate failed"
-	emake -C bin/dnssec/ || die "emake bin/dnssec failed"
+	local AR=$(tc-getAR)
+
+	emake AR=$AR -C lib/ || die "emake lib failed"
+	emake AR=$AR -C bin/dig/ || die "emake bin/dig failed"
+	emake AR=$AR -C bin/nsupdate/ || die "emake bin/nsupdate failed"
+	emake AR=$AR -C bin/dnssec/ || die "emake bin/dnssec failed"
 }
 
 src_install() {
diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml
index c6900b27485e..483ed7809f7a 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Christian Ruppert</name>
 	</maintainer>
 	<use>
-		<flag name="pkcs11">Enable PKCS#11 key support/tools for DNSSEC</flag>
 		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
 	</use>