From 670475bd695f66a3174385deb02e4d6f7b18a9ca Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 18 Jan 2014 18:16:15 +0000 Subject: Fix openssl dependencies as request per bug 498470 (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B427ABC8) --- net-dns/bind/ChangeLog | 6 +++++- net-dns/bind/bind-9.8.6.ebuild | 8 ++++---- net-dns/bind/bind-9.9.3_p2.ebuild | 8 ++++---- net-dns/bind/bind-9.9.4_p2.ebuild | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) (limited to 'net-dns/bind') diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 91176177bd25..147700cebf83 100644 --- a/net-dns/bind/ChangeLog +++ b/net-dns/bind/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dns/bind # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.480 2014/01/17 20:46:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.481 2014/01/18 18:16:15 idl0r Exp $ + + 18 Jan 2014; Christian Ruppert bind-9.8.6.ebuild, + bind-9.9.3_p2.ebuild, bind-9.9.4_p2.ebuild: + Fix openssl dependencies as request per bug 498470 17 Jan 2014; Agostino Sarubbo bind-9.9.4_p2.ebuild: Stable for ppc, wrt bug #498016 diff --git a/net-dns/bind/bind-9.8.6.ebuild b/net-dns/bind/bind-9.8.6.ebuild index 360ca3533055..d0e8206980d5 100644 --- a/net-dns/bind/bind-9.8.6.ebuild +++ b/net-dns/bind/bind-9.8.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.6.ebuild,v 1.1 2013/10/13 15:07:21 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.6.ebuild,v 1.2 2014/01/18 18:16:15 idl0r Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -63,7 +63,7 @@ REQUIRED_USE="postgres? ( dlz ) gost? ( ssl ) threads? ( caps )" -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g ) +DEPEND="ssl? ( dev-libs/openssl:0 ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) @@ -74,7 +74,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[-bindist] )" + gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bind ) diff --git a/net-dns/bind/bind-9.9.3_p2.ebuild b/net-dns/bind/bind-9.9.3_p2.ebuild index 4f759fae9ba0..694414feacb5 100644 --- a/net-dns/bind/bind-9.9.3_p2.ebuild +++ b/net-dns/bind/bind-9.9.3_p2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.3_p2.ebuild,v 1.13 2013/08/12 05:10:15 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.3_p2.ebuild,v 1.14 2014/01/18 18:16:15 idl0r Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -66,7 +66,7 @@ REQUIRED_USE="postgres? ( dlz ) gost? ( ssl ) threads? ( caps )" -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g[-bindist] ) +DEPEND="ssl? ( dev-libs/openssl:0[-bindist] ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) @@ -77,7 +77,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g[-bindist] ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) - gost? ( >=dev-libs/openssl-1.0.0[-bindist] ) + gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) python? ( virtual/python-argparse )" RDEPEND="${DEPEND} diff --git a/net-dns/bind/bind-9.9.4_p2.ebuild b/net-dns/bind/bind-9.9.4_p2.ebuild index 2b9108972ecb..d1bd904bd1ad 100644 --- a/net-dns/bind/bind-9.9.4_p2.ebuild +++ b/net-dns/bind/bind-9.9.4_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4_p2.ebuild,v 1.6 2014/01/17 20:46:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4_p2.ebuild,v 1.7 2014/01/18 18:16:15 idl0r Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -68,7 +68,7 @@ REQUIRED_USE="postgres? ( dlz ) gost? ( ssl ) threads? ( caps )" -DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g[-bindist] ) +DEPEND="ssl? ( dev-libs/openssl:0[-bindist] ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) @@ -79,7 +79,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g[-bindist] ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) - gost? ( >=dev-libs/openssl-1.0.0[-bindist] ) + gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] ) python? ( virtual/python-argparse )" RDEPEND="${DEPEND} -- cgit v1.2.3-65-gdbad