| 1 |
zmedico 10/02/11 01:14:14 |
| 2 |
|
| 3 |
Modified: ChangeLog portage-2.1.7.17.ebuild |
| 4 |
portage-2.2_rc62.ebuild portage-2.1.7.16.ebuild |
| 5 |
Log: |
| 6 |
Bug #304311 - Fix python dependencies so a supported version of python-2.x is always pulled in when upgrading from <portage-2.1.7. |
| 7 |
(Portage version: 2.2_rc62_p15336/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.674 sys-apps/portage/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.674&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.674&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.673&r2=1.674 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v |
| 19 |
retrieving revision 1.673 |
| 20 |
retrieving revision 1.674 |
| 21 |
diff -u -r1.673 -r1.674 |
| 22 |
--- ChangeLog 10 Feb 2010 01:04:03 -0000 1.673 |
| 23 |
+++ ChangeLog 11 Feb 2010 01:14:13 -0000 1.674 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for sys-apps/portage |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.673 2010/02/10 01:04:03 zmedico Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.674 2010/02/11 01:14:13 zmedico Exp $ |
| 29 |
+ |
| 30 |
+ 11 Feb 2010; Zac Medico <zmedico@g.o> portage-2.1.7.16.ebuild, |
| 31 |
+ portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild: |
| 32 |
+ Bug #304311 - Fix python dependencies so a supported of version python-2.x |
| 33 |
+ is always pulled in when upgrading from <portage-2.1.7. |
| 34 |
|
| 35 |
10 Feb 2010; Zac Medico <zmedico@g.o> portage-2.1.6.7.ebuild, |
| 36 |
portage-2.1.6.13.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 sys-apps/portage/portage-2.1.7.17.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: portage-2.1.7.17.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- portage-2.1.7.17.ebuild 10 Feb 2010 00:49:49 -0000 1.3 |
| 53 |
+++ portage-2.1.7.17.ebuild 11 Feb 2010 01:14:13 -0000 1.4 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.3 2010/02/10 00:49:49 zmedico Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.4 2010/02/11 01:14:13 zmedico Exp $ |
| 59 |
|
| 60 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 61 |
# syntax support) which also requires EAPI 2. |
| 62 |
@@ -16,7 +16,7 @@ |
| 63 |
IUSE="build doc epydoc linguas_pl python3 selinux" |
| 64 |
|
| 65 |
python_dep="python3? ( =dev-lang/python-3* ) |
| 66 |
- !python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )" |
| 67 |
+ !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )" |
| 68 |
|
| 69 |
# The pysqlite blocker is for bug #282760. |
| 70 |
DEPEND="${python_dep} |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.3 sys-apps/portage/portage-2.2_rc62.ebuild |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild?rev=1.3&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild?rev=1.3&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild?r1=1.2&r2=1.3 |
| 79 |
|
| 80 |
Index: portage-2.2_rc62.ebuild |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild,v |
| 83 |
retrieving revision 1.2 |
| 84 |
retrieving revision 1.3 |
| 85 |
diff -u -r1.2 -r1.3 |
| 86 |
--- portage-2.2_rc62.ebuild 7 Feb 2010 02:11:42 -0000 1.2 |
| 87 |
+++ portage-2.2_rc62.ebuild 11 Feb 2010 01:14:13 -0000 1.3 |
| 88 |
@@ -1,6 +1,6 @@ |
| 89 |
# Copyright 1999-2010 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild,v 1.2 2010/02/07 02:11:42 arfrever Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild,v 1.3 2010/02/11 01:14:13 zmedico Exp $ |
| 93 |
|
| 94 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 95 |
# syntax support) which also requires EAPI 2. |
| 96 |
@@ -16,7 +16,7 @@ |
| 97 |
IUSE="build doc epydoc linguas_pl python3 selinux" |
| 98 |
|
| 99 |
python_dep="python3? ( =dev-lang/python-3* ) |
| 100 |
- !python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )" |
| 101 |
+ !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )" |
| 102 |
|
| 103 |
# The pysqlite blocker is for bug #282760. |
| 104 |
DEPEND="${python_dep} |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
1.8 sys-apps/portage/portage-2.1.7.16.ebuild |
| 109 |
|
| 110 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?rev=1.8&view=markup |
| 111 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?rev=1.8&content-type=text/plain |
| 112 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild?r1=1.7&r2=1.8 |
| 113 |
|
| 114 |
Index: portage-2.1.7.16.ebuild |
| 115 |
=================================================================== |
| 116 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v |
| 117 |
retrieving revision 1.7 |
| 118 |
retrieving revision 1.8 |
| 119 |
diff -u -r1.7 -r1.8 |
| 120 |
--- portage-2.1.7.16.ebuild 10 Feb 2010 00:49:49 -0000 1.7 |
| 121 |
+++ portage-2.1.7.16.ebuild 11 Feb 2010 01:14:13 -0000 1.8 |
| 122 |
@@ -1,6 +1,6 @@ |
| 123 |
# Copyright 1999-2010 Gentoo Foundation |
| 124 |
# Distributed under the terms of the GNU General Public License v2 |
| 125 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.7 2010/02/10 00:49:49 zmedico Exp $ |
| 126 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.8 2010/02/11 01:14:13 zmedico Exp $ |
| 127 |
|
| 128 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 129 |
# syntax support) which also requires EAPI 2. |
| 130 |
@@ -16,7 +16,7 @@ |
| 131 |
IUSE="build doc epydoc linguas_pl python3 selinux" |
| 132 |
|
| 133 |
python_dep="python3? ( =dev-lang/python-3* ) |
| 134 |
- !python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )" |
| 135 |
+ !python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )" |
| 136 |
|
| 137 |
# The pysqlite blocker is for bug #282760. |
| 138 |
DEPEND="${python_dep} |
Archives