Fix OpenSSL dependency when using GOST.

Package-Manager: portage-2.1.10.65/cvs/Linux i686

6 files changed, 25 insertions, 21 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index 6044ac623bdc..1a9b06b61e56 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.403 2012/07/28 20:12:56 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.404 2012/07/28 21:29:03 idl0r Exp $
+
+  28 Jul 2012; Christian Ruppert <idl0r@gentoo.org> bind-9.8.3_p1.ebuild,
+  bind-9.8.3_p2.ebuild, bind-9.9.1_p2.ebuild, bind-9.9.1_p2-r1.ebuild:
+  Fix OpenSSL dependency when using GOST.
 
   28 Jul 2012; Christian Ruppert <idl0r@gentoo.org> bind-9.9.1_p2-r1.ebuild:
   Add a comment for the libxml2 patch
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 7b565249f236..50ffdf992305 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -21,20 +21,20 @@ DIST bind-9.9.1-P2.tar.gz 7223896 RMD160 76b8f61a1930922223544ed3671dd017a4f593d
 DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569
 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
-EBUILD bind-9.8.3_p1.ebuild 12079 RMD160 578496b8f5911cb05fc08de743ed7dcae32eb8af SHA1 da97f76c5e00a2d9209b868d92414620cbd64d99 SHA256 b6d491f3300240f3a8a2330e53066e52de9c8e8b91cd28519e1d8923afc0996f
-EBUILD bind-9.8.3_p2.ebuild 12157 RMD160 af01e5aa7fc67f78cada1429833817ca34d583d0 SHA1 595994ddf5d9d4a8cd59062b42db5f3aa77bb444 SHA256 e57fb7b1b19b693e3542749848a3851d30a59a0764a86346ba8305fdf2593a11
-EBUILD bind-9.9.1_p2-r1.ebuild 12329 RMD160 33c3025e5cb925229aa4b4027e731060e85f6f77 SHA1 8dda5e48c07699360e3a89fe47f8382f5151f3bf SHA256 abdc62e74272fdf2028ac803fe35d72fb1ed48e3503f698e578dcf4233927c88
-EBUILD bind-9.9.1_p2.ebuild 12261 RMD160 8c1ca32070c70ba137088fe001f5e66477575d9a SHA1 6930c236aa21da64cbb31d7cbcbe5cf6f3bb0178 SHA256 5c65a9aab29ada321aa81120f03888296d7e818467db6620a3593884a76c7b19
-MISC ChangeLog 67145 RMD160 19d741f274c96b7412c9ce51110dcd9525e82802 SHA1 920204724ed991fc8924f101b7575eed1bedab65 SHA256 1f90d7d8b7a604e10271cad5fba8304e17a258216ae264938dd0663ff9552ef3
+EBUILD bind-9.8.3_p1.ebuild 12087 RMD160 77b21389a6eb0e5b263b5ae3d480f8164cb4a01e SHA1 7b63e18f952f186841b60d0b6b4824a45504371d SHA256 3cd67bfd9672790010ee07b497736f892f8a9887c9887cd0dc12332946e34d53
+EBUILD bind-9.8.3_p2.ebuild 12167 RMD160 1af92915ee325b2ac3c79ef01dd8a1a1f7546ee6 SHA1 df1850d7326bb1f9513721f3bda6ff5307d9c56b SHA256 a78a967e57062e0d18bd339a6d7c87182575f0392609d7dcfd7916a3ade0a86b
+EBUILD bind-9.9.1_p2-r1.ebuild 12339 RMD160 daafce159ae8c78e1ba048825010940061e094a7 SHA1 782babe4b89cd715e722e34e1d63e646cc9238a5 SHA256 b623ddad7b492ad43a5faa1d30c606883eb2fd1a6c92827831ef47b29be7fd6e
+EBUILD bind-9.9.1_p2.ebuild 12268 RMD160 045d686318e95c697cda3fb3892b11e5551bbc3f SHA1 203de9a132b7b46d25466f1aa30a4d24ed6ba120 SHA256 5b6e99faffa75027702f11cd2b1ef79ef8d71d836da8f24ad6920e9288e28eb9
+MISC ChangeLog 67333 RMD160 045b5ca2d4b05f38ed956536302ebc539f012221 SHA1 072201bbffb7b30905c0f68ede0bacae94ddbf9e SHA256 fa404f10b4c02972905a49ed770dcdeebd92243389f18cbefcf56cc746089a0e
 MISC metadata.xml 790 RMD160 3693077439d5075b0d144989b77fa29c198e30fc SHA1 11d4c5043fbef15af4b49d634c2de4c8c2b386e5 SHA256 e93f44047cd6b599990e3a3d449eb11118ee865279c9f909251e8501763c2877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQFEfOAAoJEMOx0zmdw4Z1S8IH/11wuELULU9NLNQrnONnHtDF
-TEvfjaqoq6zuYvN9aHSUegwB8BEhwGAFdaGxTbRIxibe9rB6Ku/r5J7jLMSiGwNw
-lQ9Mpkc+g0dEVkzsrG/13Ii4ERS/obzW01V5Z6xsTIeyhBmShfKANc4TAieRgrCR
-oGt73Z1bOAz/MBZqOzY73Sz93s/fMUuSnMC0Lao+d2WLHVMJm+Gu2B1RD/1Vx4/p
-gz1+ZiT7ZcQrgU+MNIKt4cR//NHy92N1yCQlekGkLvkmITPAHxroYwvM2F440ued
-OKWjVwmT3NJvTl/drHeiYAkmvu1NvhOT49xlyov9EFZaGfwhQjSVOqY7/a8jK8Q=
-=MqOG
+iQEcBAEBCAAGBQJQFFmoAAoJEMOx0zmdw4Z1kNkIAJ5gRihifiSTw8GYLC6Q6aZp
+gIrPH+18dtw3p/xaknzd2GA578ffbMvAiIitWcouBGkvZ1THoDA3TayBG2JynVeA
+LOGHCyAEAfWdZOTFMo4qMruHOlmLrn7mSIrTUJHFGGHQeJE5gxt2ZfXJ2zhvlFQj
+ohwrNGY66zTBuJsKjG/2tDyALIndjtVI2+0mFQu8kFIMCuOxI/Pi+GxGNDJQS7FH
+Z20/udoWpvvst8yclwo+0AwYKH/LTBPvYCbWLIjdkPJ+fm+bcZHLPVQyIBxecCw2
+zquUTzd+Ab/KLdM2B6DEdO2YaJU4e7eg4A/jxvemgiRNCyubW05SzTB9cch9UWU=
+=WTnm
 -----END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.8.3_p1.ebuild b/net-dns/bind/bind-9.8.3_p1.ebuild
index f580299e67f7..d1efb66e9d03 100644
--- a/net-dns/bind/bind-9.8.3_p1.ebuild
+++ b/net-dns/bind/bind-9.8.3_p1.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.8.3_p1.ebuild,v 1.8 2012/06/16 17:23:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.3_p1.ebuild,v 1.9 2012/07/28 21:29:03 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -65,7 +65,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	geoip? ( >=dev-libs/geoip-1.4.6 )
 	gssapi? ( virtual/krb5 )
 	sdb-ldap? ( net-nds/openldap )
-	gost? ( >=dev-libs/openssl-1.0.0 )"
+	gost? ( >=dev-libs/openssl-1.0.0[-bindist] )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
diff --git a/net-dns/bind/bind-9.8.3_p2.ebuild b/net-dns/bind/bind-9.8.3_p2.ebuild
index 82b4f9d7e48c..7ba235b4c03a 100644
--- a/net-dns/bind/bind-9.8.3_p2.ebuild
+++ b/net-dns/bind/bind-9.8.3_p2.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.8.3_p2.ebuild,v 1.1 2012/07/25 17:51:53 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.3_p2.ebuild,v 1.2 2012/07/28 21:29:03 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -65,7 +65,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	geoip? ( >=dev-libs/geoip-1.4.6 )
 	gssapi? ( virtual/krb5 )
 	sdb-ldap? ( net-nds/openldap )
-	gost? ( >=dev-libs/openssl-1.0.0 )"
+	gost? ( >=dev-libs/openssl-1.0.0[-bindist] )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
diff --git a/net-dns/bind/bind-9.9.1_p2-r1.ebuild b/net-dns/bind/bind-9.9.1_p2-r1.ebuild
index 9629acb82693..00701a53df48 100644
--- a/net-dns/bind/bind-9.9.1_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.9.1_p2-r1.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_p2-r1.ebuild,v 1.2 2012/07/28 20:12:56 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.1_p2-r1.ebuild,v 1.3 2012/07/28 21:29:03 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -65,7 +65,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	geoip? ( >=dev-libs/geoip-1.4.6 )
 	gssapi? ( virtual/krb5 )
 	sdb-ldap? ( net-nds/openldap )
-	gost? ( >=dev-libs/openssl-1.0.0 )"
+	gost? ( >=dev-libs/openssl-1.0.0[-bindist] )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
diff --git a/net-dns/bind/bind-9.9.1_p2.ebuild b/net-dns/bind/bind-9.9.1_p2.ebuild
index 8180ce931b1d..ac3f4b367ca0 100644
--- a/net-dns/bind/bind-9.9.1_p2.ebuild
+++ b/net-dns/bind/bind-9.9.1_p2.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_p2.ebuild,v 1.6 2012/07/27 16:34:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.1_p2.ebuild,v 1.7 2012/07/28 21:29:03 idl0r Exp $
 
 # Re dlz/mysql and threads, needs to be verified..
 # MySQL uses thread local storage in its C api. Thus MySQL
@@ -65,7 +65,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	geoip? ( >=dev-libs/geoip-1.4.6 )
 	gssapi? ( virtual/krb5 )
 	sdb-ldap? ( net-nds/openldap )
-	gost? ( >=dev-libs/openssl-1.0.0 )"
+	gost? ( >=dev-libs/openssl-1.0.0[-bindist] )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )