| 1 |
zmedico 07/09/08 18:36:47 |
| 2 |
|
| 3 |
Modified: ChangeLog python-2.4.4-r4.ebuild |
| 4 |
python-2.4.4-r5.ebuild |
| 5 |
Log: |
| 6 |
Add build? ( !dev-python/pycrypto ) to RDEPEND in order to enforce correct merge order for a stage building issue similar to bug #88777. |
| 7 |
(Portage version: 2.2_pre7763) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.269 dev-lang/python/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.269&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?rev=1.269&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/ChangeLog?r1=1.268&r2=1.269 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v |
| 19 |
retrieving revision 1.268 |
| 20 |
retrieving revision 1.269 |
| 21 |
diff -u -r1.268 -r1.269 |
| 22 |
--- ChangeLog 7 Sep 2007 18:21:09 -0000 1.268 |
| 23 |
+++ ChangeLog 8 Sep 2007 18:36:47 -0000 1.269 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for dev-lang/python |
| 26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.268 2007/09/07 18:21:09 hawking Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.269 2007/09/08 18:36:47 zmedico Exp $ |
| 29 |
+ |
| 30 |
+ 08 Sep 2007; Zac Medico <zmedico@g.o> |
| 31 |
+ python-2.4.4-r4.ebuild, python-2.4.4-r5.ebuild: |
| 32 |
+ Add build? ( !dev-python/pycrypto ) to RDEPEND in order to enforce |
| 33 |
+ correct merge order for a stage building issue similar to bug #88777. |
| 34 |
|
| 35 |
07 Sep 2007; Ali Polatel <hawking@g.o> |
| 36 |
-files/python-2.4.3-db4.patch, -files/python-2.4.3-gentoo_obsd.patch, |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.21 dev-lang/python/python-2.4.4-r4.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild?rev=1.21&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild?rev=1.21&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild?r1=1.20&r2=1.21 |
| 45 |
|
| 46 |
Index: python-2.4.4-r4.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v |
| 49 |
retrieving revision 1.20 |
| 50 |
retrieving revision 1.21 |
| 51 |
diff -u -r1.20 -r1.21 |
| 52 |
--- python-2.4.4-r4.ebuild 4 Sep 2007 21:07:12 -0000 1.20 |
| 53 |
+++ python-2.4.4-r4.ebuild 8 Sep 2007 18:36:47 -0000 1.21 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2007 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v 1.20 2007/09/04 21:07:12 zmedico Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r4.ebuild,v 1.21 2007/09/08 18:36:47 zmedico Exp $ |
| 59 |
|
| 60 |
# NOTE about python-portage interactions : |
| 61 |
# - Do not add a pkg_setup() check for a certain version of portage |
| 62 |
@@ -48,7 +48,7 @@ |
| 63 |
# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri |
| 64 |
# NOTE: added blocker to enforce correct merge order for bug 88777. - zmedico |
| 65 |
|
| 66 |
-RDEPEND="${DEPEND} build? ( !dev-python/python-fchksum )" |
| 67 |
+RDEPEND="${DEPEND} build? ( !dev-python/python-fchksum !dev-python/pycrypto )" |
| 68 |
PDEPEND="${DEPEND} !build? ( dev-python/python-fchksum ) app-admin/python-updater" |
| 69 |
|
| 70 |
PROVIDE="virtual/python" |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.4 dev-lang/python/python-2.4.4-r5.ebuild |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild?rev=1.4&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild?rev=1.4&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild?r1=1.3&r2=1.4 |
| 79 |
|
| 80 |
Index: python-2.4.4-r5.ebuild |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v |
| 83 |
retrieving revision 1.3 |
| 84 |
retrieving revision 1.4 |
| 85 |
diff -u -r1.3 -r1.4 |
| 86 |
--- python-2.4.4-r5.ebuild 4 Sep 2007 21:07:12 -0000 1.3 |
| 87 |
+++ python-2.4.4-r5.ebuild 8 Sep 2007 18:36:47 -0000 1.4 |
| 88 |
@@ -1,6 +1,6 @@ |
| 89 |
# Copyright 1999-2007 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.3 2007/09/04 21:07:12 zmedico Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.4-r5.ebuild,v 1.4 2007/09/08 18:36:47 zmedico Exp $ |
| 93 |
|
| 94 |
# NOTE about python-portage interactions : |
| 95 |
# - Do not add a pkg_setup() check for a certain version of portage |
| 96 |
@@ -48,7 +48,7 @@ |
| 97 |
# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri |
| 98 |
# NOTE: added blocker to enforce correct merge order for bug 88777. - zmedico |
| 99 |
|
| 100 |
-RDEPEND="${DEPEND} build? ( !dev-python/python-fchksum )" |
| 101 |
+RDEPEND="${DEPEND} build? ( !dev-python/python-fchksum !dev-python/pycrypto )" |
| 102 |
PDEPEND="${DEPEND} !build? ( dev-python/python-fchksum ) app-admin/python-updater" |
| 103 |
|
| 104 |
PROVIDE="virtual/python" |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
-- |
| 109 |
gentoo-commits@g.o mailing list |
Archives