| 1 |
zmedico 12/07/07 05:38:27 |
| 2 |
|
| 3 |
Modified: portage-9999.ebuild portage-2.1.11.5.ebuild |
| 4 |
portage-2.2.0_alpha110.ebuild |
| 5 |
portage-2.1.10.65.ebuild |
| 6 |
portage-2.2.0_alpha116.ebuild |
| 7 |
Log: |
| 8 |
Make python[ssl] dep conditional on !build. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha116/cvs/Linux i686) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.52 sys-apps/portage/portage-9999.ebuild |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.52&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.52&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.51&r2=1.52 |
| 18 |
|
| 19 |
Index: portage-9999.ebuild |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v |
| 22 |
retrieving revision 1.51 |
| 23 |
retrieving revision 1.52 |
| 24 |
diff -u -r1.51 -r1.52 |
| 25 |
--- portage-9999.ebuild 6 Jul 2012 17:54:12 -0000 1.51 |
| 26 |
+++ portage-9999.ebuild 7 Jul 2012 05:38:27 -0000 1.52 |
| 27 |
@@ -1,6 +1,6 @@ |
| 28 |
# Copyright 1999-2012 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.51 2012/07/06 17:54:12 zmedico Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.52 2012/07/07 05:38:27 zmedico Exp $ |
| 32 |
|
| 33 |
EAPI=3 |
| 34 |
inherit git-2 eutils multilib python |
| 35 |
@@ -35,10 +35,12 @@ |
| 36 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
| 37 |
# for now, don't pull in xattr deps for other kernels. |
| 38 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
| 39 |
-RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 40 |
+RDEPEND="${python_dep} |
| 41 |
!build? ( >=sys-apps/sed-4.0.5 |
| 42 |
>=app-shells/bash-3.2_p17 |
| 43 |
- >=app-admin/eselect-1.2 ) |
| 44 |
+ >=app-admin/eselect-1.2 |
| 45 |
+ || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 46 |
+ ) |
| 47 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 48 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 49 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.3 sys-apps/portage/portage-2.1.11.5.ebuild |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild?rev=1.3&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild?rev=1.3&content-type=text/plain |
| 57 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild?r1=1.2&r2=1.3 |
| 58 |
|
| 59 |
Index: portage-2.1.11.5.ebuild |
| 60 |
=================================================================== |
| 61 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild,v |
| 62 |
retrieving revision 1.2 |
| 63 |
retrieving revision 1.3 |
| 64 |
diff -u -r1.2 -r1.3 |
| 65 |
--- portage-2.1.11.5.ebuild 6 Jul 2012 17:54:12 -0000 1.2 |
| 66 |
+++ portage-2.1.11.5.ebuild 7 Jul 2012 05:38:27 -0000 1.3 |
| 67 |
@@ -1,6 +1,6 @@ |
| 68 |
# Copyright 1999-2012 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild,v 1.2 2012/07/06 17:54:12 zmedico Exp $ |
| 71 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.5.ebuild,v 1.3 2012/07/07 05:38:27 zmedico Exp $ |
| 72 |
|
| 73 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 74 |
# syntax support) which also requires EAPI 2. |
| 75 |
@@ -37,10 +37,12 @@ |
| 76 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
| 77 |
# for now, don't pull in xattr deps for other kernels. |
| 78 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
| 79 |
-RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 80 |
+RDEPEND="${python_dep} |
| 81 |
!build? ( >=sys-apps/sed-4.0.5 |
| 82 |
>=app-shells/bash-3.2_p17 |
| 83 |
- >=app-admin/eselect-1.2 ) |
| 84 |
+ >=app-admin/eselect-1.2 |
| 85 |
+ || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 86 |
+ ) |
| 87 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 88 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 89 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.4 sys-apps/portage/portage-2.2.0_alpha110.ebuild |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild?rev=1.4&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild?rev=1.4&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild?r1=1.3&r2=1.4 |
| 98 |
|
| 99 |
Index: portage-2.2.0_alpha110.ebuild |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild,v |
| 102 |
retrieving revision 1.3 |
| 103 |
retrieving revision 1.4 |
| 104 |
diff -u -r1.3 -r1.4 |
| 105 |
--- portage-2.2.0_alpha110.ebuild 6 Jul 2012 17:54:12 -0000 1.3 |
| 106 |
+++ portage-2.2.0_alpha110.ebuild 7 Jul 2012 05:38:27 -0000 1.4 |
| 107 |
@@ -1,6 +1,6 @@ |
| 108 |
# Copyright 1999-2012 Gentoo Foundation |
| 109 |
# Distributed under the terms of the GNU General Public License v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild,v 1.3 2012/07/06 17:54:12 zmedico Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha110.ebuild,v 1.4 2012/07/07 05:38:27 zmedico Exp $ |
| 112 |
|
| 113 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 114 |
# syntax support) which also requires EAPI 2. |
| 115 |
@@ -37,10 +37,12 @@ |
| 116 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
| 117 |
# for now, don't pull in xattr deps for other kernels. |
| 118 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
| 119 |
-RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 120 |
+RDEPEND="${python_dep} |
| 121 |
!build? ( >=sys-apps/sed-4.0.5 |
| 122 |
>=app-shells/bash-3.2_p17 |
| 123 |
- >=app-admin/eselect-1.2 ) |
| 124 |
+ >=app-admin/eselect-1.2 |
| 125 |
+ || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 126 |
+ ) |
| 127 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 128 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 129 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
| 130 |
|
| 131 |
|
| 132 |
|
| 133 |
1.10 sys-apps/portage/portage-2.1.10.65.ebuild |
| 134 |
|
| 135 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild?rev=1.10&view=markup |
| 136 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild?rev=1.10&content-type=text/plain |
| 137 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild?r1=1.9&r2=1.10 |
| 138 |
|
| 139 |
Index: portage-2.1.10.65.ebuild |
| 140 |
=================================================================== |
| 141 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild,v |
| 142 |
retrieving revision 1.9 |
| 143 |
retrieving revision 1.10 |
| 144 |
diff -u -r1.9 -r1.10 |
| 145 |
--- portage-2.1.10.65.ebuild 6 Jul 2012 17:54:12 -0000 1.9 |
| 146 |
+++ portage-2.1.10.65.ebuild 7 Jul 2012 05:38:27 -0000 1.10 |
| 147 |
@@ -1,6 +1,6 @@ |
| 148 |
# Copyright 1999-2012 Gentoo Foundation |
| 149 |
# Distributed under the terms of the GNU General Public License v2 |
| 150 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild,v 1.9 2012/07/06 17:54:12 zmedico Exp $ |
| 151 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.10.65.ebuild,v 1.10 2012/07/07 05:38:27 zmedico Exp $ |
| 152 |
|
| 153 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 154 |
# syntax support) which also requires EAPI 2. |
| 155 |
@@ -37,10 +37,12 @@ |
| 156 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
| 157 |
# for now, don't pull in xattr deps for other kernels. |
| 158 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
| 159 |
-RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 160 |
+RDEPEND="${python_dep} |
| 161 |
!build? ( >=sys-apps/sed-4.0.5 |
| 162 |
>=app-shells/bash-3.2_p17 |
| 163 |
- >=app-admin/eselect-1.2 ) |
| 164 |
+ >=app-admin/eselect-1.2 |
| 165 |
+ || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 166 |
+ ) |
| 167 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 168 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 169 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
| 170 |
|
| 171 |
|
| 172 |
|
| 173 |
1.3 sys-apps/portage/portage-2.2.0_alpha116.ebuild |
| 174 |
|
| 175 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild?rev=1.3&view=markup |
| 176 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild?rev=1.3&content-type=text/plain |
| 177 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild?r1=1.2&r2=1.3 |
| 178 |
|
| 179 |
Index: portage-2.2.0_alpha116.ebuild |
| 180 |
=================================================================== |
| 181 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v |
| 182 |
retrieving revision 1.2 |
| 183 |
retrieving revision 1.3 |
| 184 |
diff -u -r1.2 -r1.3 |
| 185 |
--- portage-2.2.0_alpha116.ebuild 6 Jul 2012 17:54:12 -0000 1.2 |
| 186 |
+++ portage-2.2.0_alpha116.ebuild 7 Jul 2012 05:38:27 -0000 1.3 |
| 187 |
@@ -1,6 +1,6 @@ |
| 188 |
# Copyright 1999-2012 Gentoo Foundation |
| 189 |
# Distributed under the terms of the GNU General Public License v2 |
| 190 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v 1.2 2012/07/06 17:54:12 zmedico Exp $ |
| 191 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha116.ebuild,v 1.3 2012/07/07 05:38:27 zmedico Exp $ |
| 192 |
|
| 193 |
# Require EAPI 2 since we now require at least python-2.6 (for python 3 |
| 194 |
# syntax support) which also requires EAPI 2. |
| 195 |
@@ -37,10 +37,12 @@ |
| 196 |
# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so |
| 197 |
# for now, don't pull in xattr deps for other kernels. |
| 198 |
# For whirlpool hash, require python[ssl] or python-mhash (bug #425046). |
| 199 |
-RDEPEND="${python_dep} || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 200 |
+RDEPEND="${python_dep} |
| 201 |
!build? ( >=sys-apps/sed-4.0.5 |
| 202 |
>=app-shells/bash-3.2_p17 |
| 203 |
- >=app-admin/eselect-1.2 ) |
| 204 |
+ >=app-admin/eselect-1.2 |
| 205 |
+ || ( ${python_dep_ssl} dev-python/python-mhash ) |
| 206 |
+ ) |
| 207 |
elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) |
| 208 |
elibc_glibc? ( >=sys-apps/sandbox-2.2 ) |
| 209 |
elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) |
Archives