diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-03-25 08:00:31 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-03-25 08:00:31 +0000 |
commit | 317dccfc38a9afef329a388799878f10f5562422 (patch) | |
tree | e194b2bc417f6bbbc4cb6ae4c3b4d7a63fe2322f /app-crypt/mit-krb5 | |
parent | Fix REQUIRED_USE for Qt. (diff) | |
download | gentoo-2-317dccfc38a9afef329a388799878f10f5562422.tar.gz gentoo-2-317dccfc38a9afef329a388799878f10f5562422.tar.bz2 gentoo-2-317dccfc38a9afef329a388799878f10f5562422.zip |
Fix tcl/tk slotting
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-crypt/mit-krb5')
-rw-r--r-- | app-crypt/mit-krb5/ChangeLog | 6 | ||||
-rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild | 23 | ||||
-rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild | 23 |
3 files changed, 35 insertions, 17 deletions
diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog index 0b8011326dd7..c8645c98a556 100644 --- a/app-crypt/mit-krb5/ChangeLog +++ b/app-crypt/mit-krb5/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/mit-krb5 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.453 2015/02/25 10:14:51 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.454 2015/03/25 08:00:31 jlec Exp $ + + 25 Mar 2015; Justin Lecher <jlec@gentoo.org> mit-krb5-1.13-r1.ebuild, + mit-krb5-1.13.1.ebuild: + Fix tcl/tk slotting 25 Feb 2015; Eray Aslan <eras@gentoo.org> -mit-krb5-1.13.ebuild: Remove old diff --git a/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild index 13b576207034..72caa35b4a62 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild,v 1.10 2015/02/24 10:57:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13-r1.ebuild,v 1.11 2015/03/25 08:00:31 jlec Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) + +PYTHON_COMPAT=( python2_7 ) + inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator MY_P="${P/mit-}" @@ -17,11 +19,14 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd" -CDEPEND="!!app-crypt/heimdal +CDEPEND=" + !!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] - || ( >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}] + || ( + >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}] >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}] - >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}] ) + >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}] + ) keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] ) openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) @@ -34,9 +39,11 @@ DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc doc? ( virtual/latex-base ) - test? ( ${PYTHON_DEPS} - dev-lang/tcl - dev-util/dejagnu )" + test? ( + ${PYTHON_DEPS} + dev-lang/tcl:0 + dev-util/dejagnu + )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-kerberos )" diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild index 118bd3c2707f..7f134d8c1947 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild,v 1.1 2015/02/13 14:51:00 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13.1.ebuild,v 1.2 2015/03/25 08:00:31 jlec Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) + +PYTHON_COMPAT=( python2_7 ) + inherit autotools eutils flag-o-matic multilib-minimal python-any-r1 versionator MY_P="${P/mit-}" @@ -17,11 +19,14 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd" -CDEPEND="!!app-crypt/heimdal +CDEPEND=" + !!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] - || ( >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}] + || ( + >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}] >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}] - >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}] ) + >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}] + ) keyutils? ( >=sys-apps/keyutils-1.5.8[${MULTILIB_USEDEP}] ) openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) @@ -34,9 +39,11 @@ DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc doc? ( virtual/latex-base ) - test? ( ${PYTHON_DEPS} - dev-lang/tcl - dev-util/dejagnu )" + test? ( + ${PYTHON_DEPS} + dev-lang/tcl:0 + dev-util/dejagnu + )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-kerberos )" |