diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-09-04 21:35:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-09-04 21:35:07 +0000 |
| commit | 7ee1eb95c0090189f87fd23cf57e411ac05d1f92 (patch) | |
| tree | 8d26cd7bcc9079e3e59421f96afb4d08ab6d035f /sys-apps | |
| parent | Added a patch from Ryan Hill <dirtyepic@gentoo.org> to fix the tests failing.... (diff) | |
| download | gentoo-2-7ee1eb95c0090189f87fd23cf57e411ac05d1f92.tar.gz gentoo-2-7ee1eb95c0090189f87fd23cf57e411ac05d1f92.tar.bz2 gentoo-2-7ee1eb95c0090189f87fd23cf57e411ac05d1f92.zip | |
Bug #191170 - Drop the python-fchksum dep and make pycrypto optional when python-2.5 is installed.
(Portage version: 2.2_pre7718)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/portage-2.1.2.12.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.3.6.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.3.7.ebuild | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/sys-apps/portage/portage-2.1.2.12.ebuild b/sys-apps/portage/portage-2.1.2.12.ebuild index 3d380e40643b..0ddb0ed8fdbe 100644 --- a/sys-apps/portage/portage-2.1.2.12.ebuild +++ b/sys-apps/portage/portage-2.1.2.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.12.ebuild,v 1.10 2007/08/25 14:24:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2.12.ebuild,v 1.11 2007/09/04 21:35:07 zmedico Exp $ inherit toolchain-funcs eutils flag-o-matic multilib @@ -18,7 +18,6 @@ DEPEND=">=dev-lang/python-2.4 epydoc? ( >=dev-python/epydoc-2.0 )" RDEPEND=">=dev-lang/python-2.4 !build? ( >=sys-apps/sed-4.0.5 - dev-python/python-fchksum >=app-shells/bash-3.0 ) elibc_glibc? ( >=sys-apps/sandbox-1.2.17 ) elibc_uclibc? ( >=sys-apps/sandbox-1.2.17 ) @@ -26,7 +25,7 @@ RDEPEND=">=dev-lang/python-2.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) selinux? ( >=dev-python/python-selinux-2.16 ) doc? ( app-portage/portage-manpages ) - >=dev-python/pycrypto-2.0.1-r5 + || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) >=net-misc/rsync-2.6.4" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 diff --git a/sys-apps/portage/portage-2.1.3.6.ebuild b/sys-apps/portage/portage-2.1.3.6.ebuild index 05baad4bed3b..f0c5e3a67aa2 100644 --- a/sys-apps/portage/portage-2.1.3.6.ebuild +++ b/sys-apps/portage/portage-2.1.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.6.ebuild,v 1.2 2007/08/24 02:16:46 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.6.ebuild,v 1.3 2007/09/04 21:35:07 zmedico Exp $ inherit toolchain-funcs eutils flag-o-matic multilib @@ -19,7 +19,6 @@ DEPEND=">=dev-lang/python-2.4 epydoc? ( >=dev-python/epydoc-2.0 )" RDEPEND=">=dev-lang/python-2.4 !build? ( >=sys-apps/sed-4.0.5 - dev-python/python-fchksum >=app-shells/bash-3.0 ) elibc_FreeBSD? ( dev-python/py-freebsd ) elibc_glibc? ( >=sys-apps/sandbox-1.2.17 ) @@ -28,7 +27,7 @@ RDEPEND=">=dev-lang/python-2.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) selinux? ( >=dev-python/python-selinux-2.16 ) doc? ( || ( app-portage/eclass-manpages app-portage/portage-manpages ) ) - >=dev-python/pycrypto-2.0.1-r5 + || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) >=net-misc/rsync-2.6.4" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 diff --git a/sys-apps/portage/portage-2.1.3.7.ebuild b/sys-apps/portage/portage-2.1.3.7.ebuild index 9ee5494feb7e..7e5d6efd9157 100644 --- a/sys-apps/portage/portage-2.1.3.7.ebuild +++ b/sys-apps/portage/portage-2.1.3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.7.ebuild,v 1.2 2007/08/28 09:00:17 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.3.7.ebuild,v 1.3 2007/09/04 21:35:07 zmedico Exp $ inherit toolchain-funcs eutils flag-o-matic multilib @@ -19,7 +19,6 @@ DEPEND=">=dev-lang/python-2.4 epydoc? ( >=dev-python/epydoc-2.0 )" RDEPEND=">=dev-lang/python-2.4 !build? ( >=sys-apps/sed-4.0.5 - dev-python/python-fchksum >=app-shells/bash-3.0 ) elibc_FreeBSD? ( dev-python/py-freebsd ) elibc_glibc? ( >=sys-apps/sandbox-1.2.17 ) @@ -28,7 +27,7 @@ RDEPEND=">=dev-lang/python-2.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) selinux? ( >=dev-python/python-selinux-2.16 ) doc? ( || ( app-portage/eclass-manpages app-portage/portage-manpages ) ) - >=dev-python/pycrypto-2.0.1-r5 + || ( >=dev-lang/python-2.5 >=dev-python/pycrypto-2.0.1-r6 ) >=net-misc/rsync-2.6.4" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # rsync-2.6.4 rdep is for the --filter option #167668 |