summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-06 21:26:33 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-06 21:26:33 +0000
commitfa75fe1558384415859f41ffc4c9ac3aa9db284c (patch)
treee83b804c4e2cb7ac5265255ffd14b0594083a5f1 /sys-apps
parentVersion bump. (diff)
downloadhistorical-fa75fe1558384415859f41ffc4c9ac3aa9db284c.tar.gz
historical-fa75fe1558384415859f41ffc4c9ac3aa9db284c.tar.bz2
historical-fa75fe1558384415859f41ffc4c9ac3aa9db284c.zip
Use has_version instead of built_with_use for python[ssl] check.
Package-Manager: portage-2.2_rc44/cvs/Linux i686
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/portage/ChangeLog5
-rw-r--r--sys-apps/portage/Manifest10
-rw-r--r--sys-apps/portage/portage-2.2_rc44.ebuild16
3 files changed, 16 insertions, 15 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index ec66e6efcccc..b56dd191961f 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.637 2009/10/06 20:56:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.638 2009/10/06 21:26:33 zmedico Exp $
+
+ 06 Oct 2009; Zac Medico <zmedico@gentoo.org> portage-2.2_rc44.ebuild:
+ Use has_version instead of built_with_use for python[ssl] check.
06 Oct 2009; Zac Medico <zmedico@gentoo.org> -portage-2.2_rc39.ebuild,
-portage-2.2_rc40.ebuild, -portage-2.2_rc43.ebuild:
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 266f53062ada..59d43301da32 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -21,13 +21,13 @@ EBUILD portage-2.1.6.7.ebuild 8863 RMD160 79a6496a6c0cdc8fb8d77c2f9394508d920ad5
EBUILD portage-2.2_rc33.ebuild 10578 RMD160 3542800e0ba7d29ed00d74a15a3ccbb55170d414 SHA1 e9d6a4c9ea0c6b79073cc0c4a0220b5b762e8f7d SHA256 993739cf790fa4bd63b67d79b82cd45bd7cefa2600780c6a218d5d47af107bb6
EBUILD portage-2.2_rc41.ebuild 9853 RMD160 b59699be6e4b25104fd56105814624b4bd00403f SHA1 a31c918762acb1c9f1aad325be9e3747c0eb8307 SHA256 f41181045ad2eca98d5b70acce9885bac803a7bd5cfa48d7c62f967c10e6da5c
EBUILD portage-2.2_rc42.ebuild 10577 RMD160 ea085da802ee8464cadf3a168377f2254835d506 SHA1 23e4c7b50482944f03dcf711515930ed6928ca0b SHA256 94e7b7ed0830c3f73d0a1eab1795b21edecc35fbda9cc6bd6d73f558225521da
-EBUILD portage-2.2_rc44.ebuild 10601 RMD160 79127b60acf773626819e0432e6a5f899b914743 SHA1 93641d90a20f1d5e010421f05e8c210cd352857b SHA256 9790427e926c78ec6a0d8cc4ff2a29030c4f92715e822494bfa1f14ad1f4b8ac
-MISC ChangeLog 42244 RMD160 255a5b2fc97df0d6bda31124a5f45d367e6b2881 SHA1 039a39c06b7580e30761fc26ea2835aa5f702610 SHA256 46f73208e6cd587787859525b50c26e6b5cb572133ece6a2d8ead2611958a5e0
+EBUILD portage-2.2_rc44.ebuild 10541 RMD160 6d003419669515f07586c4b030357c299198f3a9 SHA1 5b8b632d0ef8a07e5921fc5b1b353136f504204d SHA256 90673079ccd653a92dd7f1a7fba5aac8c59f5a56477bf53baf4afa7bc9500a88
+MISC ChangeLog 42384 RMD160 1ae83f1d718f8ca161b04e3c13ffaa281a783245 SHA1 032629095596a31fb942be1640ace34ec4dc7390 SHA256 7e91e01fcf4ce1953c858768b9e752174659bed5bf5726ac4d8f6f113b8958f4
MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkrLrwsACgkQ/ejvha5XGaPkRQCfQnxEmCQHXlzLlUOS/I7NEfrr
-UVYAoIjW75hQ7OexWHYwMdbNf1QuX6+d
-=SzyK
+iEYEARECAAYFAkrLtiwACgkQ/ejvha5XGaM9IACg3csaAXlec0sJsQWitEB3Vdkk
+IPQAoL3dfbsyw+4zc25w5EdzJKFXWzud
+=JEpT
-----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.2_rc44.ebuild b/sys-apps/portage/portage-2.2_rc44.ebuild
index 4aa411dd8be9..d0afe1f1a437 100644
--- a/sys-apps/portage/portage-2.2_rc44.ebuild
+++ b/sys-apps/portage/portage-2.2_rc44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc44.ebuild,v 1.2 2009/10/06 20:53:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc44.ebuild,v 1.3 2009/10/06 21:26:33 zmedico Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -227,14 +227,12 @@ src_install() {
pkg_preinst() {
if ! use build && ! has_version dev-python/pycrypto && \
- has_version '>=dev-lang/python-2.5' ; then
- if ! built_with_use '>=dev-lang/python-2.5' ssl ; then
- ewarn "If you are an ebuild developer and you plan to commit ebuilds"
- ewarn "with this system then please install dev-python/pycrypto or"
- ewarn "enable the ssl USE flag for >=dev-lang/python-2.5 in order"
- ewarn "to enable RMD160 hash support."
- ewarn "See bug #198398 for more information."
- fi
+ ! has_version '>=dev-lang/python-2.6[ssl]' ; then
+ ewarn "If you are an ebuild developer and you plan to commit ebuilds"
+ ewarn "with this system then please install dev-python/pycrypto or"
+ ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
+ ewarn "to enable RMD160 hash support."
+ ewarn "See bug #198398 for more information."
fi
if [ -f "${ROOT}/etc/make.globals" ]; then
rm "${ROOT}/etc/make.globals"