Update LICENSE, RSA-PKCS11 is replaced by RSA, bug 440752.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 25 insertions, 15 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 1bc1ec7a95f9..237d11fefc6f 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.427 2012/11/01 19:07:51 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.428 2012/11/04 20:20:20 ulm Exp $
+
+  04 Nov 2012; Ulrich Müller <ulm@gentoo.org> bind-9.9.1_p4.ebuild,
+  bind-9.9.2.ebuild:
+  Update LICENSE, RSA-PKCS11 is replaced by RSA, bug 440752.
 
   01 Nov 2012; Christian Ruppert <idl0r@gentoo.org> bind-9.9.2.ebuild:
   Fix LICENSE, bug 440752.
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 4551fadc7e41..d4f95dc3cd11 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -19,18 +19,24 @@ DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f2682756
 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e
 DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2
 DIST rl-9.9.1-P2.patch 80440 SHA256 99efd951582ce790e274082e0bedaea698b9b7f49cf1de387752583993cf2115 SHA512 7a6a7b588de68f2dc2ed4f19b55adc1d5083a80c672889c823016c92195b4b6f215cdb6328af5127c62ff616451f5991c11dcef5e54d9ca7d58e391c4db8823b WHIRLPOOL 896744688dac120bf93c0a340f04fed1fa6a67ec91fa10580bf3fab803805f87f1f279c87a52b7381f239941c40e9bfed84a771831a7ba42ae338796b4faa95b
-EBUILD bind-9.9.1_p4.ebuild 12819 SHA256 0934215b5207657eede104187fe463670d1a5ad1baf6dce223a35195c82f40b6 SHA512 51d96a877f0750d926a8e9c5e158c195b6d9f9e600030b8634b28ee528c0da5efaa2c860d2db548b36f05b2ae2953e1ca8008f0b8591cc7d9d99388e162281d1 WHIRLPOOL 94fd05d0c00cd8170948f32193b762026043461dfef71bb99f3ce1c6c5bb5f465d8962648ae1005c4f26b0befba7631eed1e93e140ee916294bcbd2ae9ba1376
-EBUILD bind-9.9.2.ebuild 13388 SHA256 76d4798cdae0d1e2e867d2f4b6b4fd0f9b8044324e6542abde0e9dd95b8b9f4c SHA512 be10e74438d99784601690626fbf19b880a9894549f269dd014b97748b54d835e7d6ca69445d87e075eaa44c6ac37eff317fe6064cbf75916a36996b6ace1acd WHIRLPOOL 4214934ea71e02ac1fe68c3a2b9d97c8ffc3bc7f0dea7e5012e4753f954c5a3fbd61c448dfcc30c6edc353466c2759786eae05d85507b1e4d7e5ab9a851e2eff
-MISC ChangeLog 70308 SHA256 8ac4ecc1d819c0b3fbfdfb9a5e4c22255700a02c8db41282cd3fad410c306bea SHA512 13541dca54df53df8642aed03c3bbb28b65c2a82633845e7978423285c444c02d01827f9995a7d9cbf24be4046120cece5bdf6ba0c1327808da16498c8599cd2 WHIRLPOOL 912872a92558941a1db2dfbb6ed9339014f4e099029c8529adb4ad4cfdfc6957fe27aefb0a38ed7317221cce754fa52a4b54bb14c1a788e61bd9ac7273f3c711
+EBUILD bind-9.9.1_p4.ebuild 12847 SHA256 5107c5b164c1508f9dd5d03bcfb48de0513d62f139c6fee199ebfaaac3358be5 SHA512 ad7b572d2a562ce72495045e3b0545dfc07b17b1f782c656110cb484379b4e4a4034837aa928173455b38881fcab4d7a0c107b0f9b482c5f6745a93ef6ca96a6 WHIRLPOOL 4a4c5fd556d78f69225f85208cc9a592fa36670b215ae69c76b15c422af211bad4ec3223d2194e27aaa4a80503c36f99c44fb853cb864720e1e26ddaf86fe64d
+EBUILD bind-9.9.2.ebuild 13379 SHA256 3f75f7c5af791a284a3f4e2bd0b26f2fc8bcd1b4676dfa56d9c14fa1fd6db8d3 SHA512 e8fc255392f65d20c503c195bdde4b13e52c2a2a08452a687290eb0aaea7ed37b7d0146b00344139350a4f11385598b339f2ee5e64880afb9abbb58043be2ddd WHIRLPOOL 12a8d03a809931d3d28a5d0f4465fca797f6864e57f468635b58904a683abd2d59c7443b82bcf5d1efcac52bf379c280c0997509e389b3323d5bfa0c766fb7c9
+MISC ChangeLog 70458 SHA256 6deb0ce0825b47fc0273a1ca110e9b43f6bb09a77f3c4931af9bfb3c038ca5fd SHA512 468ac5cf43a1dc0419c8fcb49f554bca564d3fafcaf243eb66922763a7194bf7a032818e971842534698eadc1148e64026571fb16c591f56013eeb0aaf94e7a8 WHIRLPOOL f4b1cab89931233b367a7c5d74e8e8337f626a7581e9b1af412bf1c5f9ee9b198a96c6dbbef1e88ffcc2e1e63db24dcbb757be36b4c5b663894201a306d091ef
 MISC metadata.xml 860 SHA256 0fce4fc0233c67076d886f2103083172217f79d36af3d651c3435cad719762ae SHA512 df24c1a19401a50681d32370dfed6b5735b591b9db828b290c39cf1701ce5697f7cad83b4f5410eb063482fecbb1694cc6508ded74d3dcd7bf2cc7f3c6d0db94 WHIRLPOOL 4b04fd631b0c3dc03f06599f81d113bcc7f36d9d54d54fb49c49a741c539248d37ec5c2df24f6f994ddf0bcb55c9b12fa80fe4bec16855a48a53bdf07d813039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQksiIAAoJEMOx0zmdw4Z1qoIH+wbke1bjUWnpTqG4U52vdo8Q
-Fy1cUuge9vDUeviZQwtPYCdxCp6j96K3dNX7PrnthABeq+/x5ADV0kLlM779mehJ
-x8GrkNwrWPnq7U4D5Ybk2oOijRDJTbSOaZy2e1G3M8LsROyamBQi3bw2JR6WQVXq
-tgZcTk5nE71+rB/Cfjfm5A7qOJCJq+k0BWWHbaU++QtQVjgWPKKL67M58UfZSTte
-UgSDrsN7mMdqdg5aNHzTq21K3JqytHBe+4awi1A1Mn4GWtTXZqFJ4KpxCpN4C99+
-PW+2lKwrPnnv9MxAcLeS2tyrvFdP3RnbRvBrgmZNzG9Zzl/s/g90gr5kDXi/D+0=
-=Cjdu
+iQIcBAEBCAAGBQJQls4kAAoJEDxpGckxwJCBE3kQALlvcwt7HvK64TOh1thFwlMH
+dLhdBBYureh/uaBLZxmNfQsLfHOmSFcjauaUYiHpNMow5G7InOdL2gQN0lKPN07A
+vj/PI/jeLmWj2b6FIOFRDv2OoA7HByfU528gEffNi7FJoGu9H+VlukFZDTN03FbI
+wkJM1Hq1pe/1Xs25qyajUXxJDDYtiqbGtro4SSB6twDpkwhQrTO6T/RXa1WDlC/o
+hrhS7CkJ6XGPj1XBKOTtS9oj82tOoBgBUdRWu5cTTqwMepfJ1VkEmAEJ8Sg32B1c
+ZmcJomMm9QIuu2/5ZkYj/rCN1C+kJgr71cfzakI0+mKkmGWPFbRIfHe1eQ/ZMNK2
+st5ZmOX74ynw71gPvRAOY4VvjdnTHzj0MIb2iX4A5kimxzhmvgLCVx4gOtskrenD
+SvjompieqYRPN2A7IKImcuiK+tI+nggaflFVBmKZbJm7lBn1KWFtDA53jpmgYykD
+mYfFmzyGpTjjLPJckyeMrE43V92Ei1ruZ7uM2SWj1Fyd8Sv0CqS/ZmqrhSUUFq+5
+bzkuQILp+azJrXn3goftujaLYhITPhQ2qaLrysbWxc8NbEwpmV53CJa9jifISi4x
+O0oAYflaotfF0Sb1oKZUATwETWJeaxPFIegaD8T/S+GgNutvVlw4ZH5YtXEUCXci
+/4WU/E5sMaxRRhMRhmnf
+=t1Dp
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.9.1_p4.ebuild b/net-dns/bind/bind-9.9.1_p4.ebuild
index 4a7243d90c6b..333f02337a35 100644
--- a/net-dns/bind/bind-9.9.1_p4.ebuild
+++ b/net-dns/bind/bind-9.9.1_p4.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/bind-9.9.1_p4.ebuild,v 1.7 2012/10/17 18:00:15 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.1_p4.ebuild,v 1.8 2012/11/04 20:20:20 ulm Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -45,7 +45,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 	sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 )
 	rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )"
 
-LICENSE="as-is"
+LICENSE="ISC BSD BSD-2 HPND JNIC RSA 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="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc
diff --git a/net-dns/bind/bind-9.9.2.ebuild b/net-dns/bind/bind-9.9.2.ebuild
index 0405eb6b3584..30852d0c7fc3 100644
--- a/net-dns/bind/bind-9.9.2.ebuild
+++ b/net-dns/bind/bind-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/bind-9.9.2.ebuild,v 1.6 2012/11/01 19:07:51 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2.ebuild,v 1.7 2012/11/04 20:20:20 ulm Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -50,7 +50,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
 	)"
 #	rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )"
 
-LICENSE="ISC BSD BSD-2 HPND JNIC RSA-PKCS11 openssl"
+LICENSE="ISC BSD BSD-2 HPND JNIC RSA 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="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc