summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-03-02 04:25:40 +0000
committerZac Medico <zmedico@gentoo.org>2013-03-02 04:25:40 +0000
commitade411ec9fd11c7d3a21c26b69cf7d53b941a5bc (patch)
treee2bd5a362ea93014773f606823af183ad66674da /sys-apps
parent2.1.11.53 version bump. This fixes bug #102297 (remove (diff)
downloadgentoo-2-ade411ec9fd11c7d3a21c26b69cf7d53b941a5bc.tar.gz
gentoo-2-ade411ec9fd11c7d3a21c26b69cf7d53b941a5bc.tar.bz2
gentoo-2-ade411ec9fd11c7d3a21c26b69cf7d53b941a5bc.zip
2.2.0_alpha164 version bump. This includes all of the fixes in 2.1.11.53.
Bug #210077 tracks all bugs fixed since portage-2.1.x. (Portage version: 2.2.0_alpha164/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/ChangeLog9
-rw-r--r--sys-apps/portage/portage-2.2.0_alpha164.ebuild (renamed from sys-apps/portage/portage-2.2.0_alpha161.ebuild)7
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 28d127752278..dcf9cb274511 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1215 2013/03/02 04:24:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1216 2013/03/02 04:25:40 zmedico Exp $
+
+*portage-2.2.0_alpha164 (02 Mar 2013)
+
+ 02 Mar 2013; Zac Medico <zmedico@gentoo.org> +portage-2.2.0_alpha164.ebuild,
+ -portage-2.2.0_alpha161.ebuild:
+ 2.2.0_alpha164 version bump. This includes all of the fixes in 2.1.11.53. Bug
+ #210077 tracks all bugs fixed since portage-2.1.x.
*portage-2.1.11.53 (02 Mar 2013)
diff --git a/sys-apps/portage/portage-2.2.0_alpha161.ebuild b/sys-apps/portage/portage-2.2.0_alpha164.ebuild
index a6e7a9a1a781..d9e594340daf 100644
--- a/sys-apps/portage/portage-2.2.0_alpha161.ebuild
+++ b/sys-apps/portage/portage-2.2.0_alpha164.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha161.ebuild,v 1.4 2013/02/09 17:49:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha164.ebuild,v 1.1 2013/03/02 04:25:40 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -16,13 +16,12 @@ IUSE="build doc epydoc +ipc linguas_pl linguas_ru pypy2_0 python2 python3 selinu
# Import of the io module in python-2.6 raises ImportError for the
# thread module if threading is disabled.
-# >=python-2.6.5 for bug #456236
python_dep_ssl="python3? ( =dev-lang/python-3*[ssl] )
!pypy2_0? ( !python2? ( !python3? (
- || ( >=dev-lang/python-2.7[ssl] >=dev-lang/python-2.6.5:2.6[threads,ssl] )
+ || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] )
) ) )
pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) )
- python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] >=dev-lang/python-2.6.5:2.6[ssl,threads] ) ) )"
+ python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) )"
python_dep="${python_dep_ssl//\[ssl\]}"
python_dep="${python_dep//,ssl}"
python_dep="${python_dep//ssl,}"