summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-29 18:01:05 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-29 18:01:05 +0000
commit7c2e687a33861df616c7df7e27c9454703994d28 (patch)
treeb060086575ff602b4a10c5c571d302b4913e1f8a /dev-util/cmake
parentUse PYTHON_MODNAME. (diff)
downloadhistorical-7c2e687a33861df616c7df7e27c9454703994d28.tar.gz
historical-7c2e687a33861df616c7df7e27c9454703994d28.tar.bz2
historical-7c2e687a33861df616c7df7e27c9454703994d28.zip
Update deps so the tests are not failing, and features are not missing. Per bug #295070.
Package-Manager: portage-2.2_rc53/cvs/Linux x86_64
Diffstat (limited to 'dev-util/cmake')
-rw-r--r--dev-util/cmake/ChangeLog6
-rw-r--r--dev-util/cmake/Manifest4
-rw-r--r--dev-util/cmake/cmake-2.8.0.ebuild8
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index e7b8963c903f..b39ed6191788 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/cmake
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.121 2009/11/24 15:59:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.122 2009/11/29 18:01:05 scarabeus Exp $
+
+ 29 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.0.ebuild:
+ Update deps so the tests are not failing, and features are not missing.
+ Per bug #295070.
24 Nov 2009; Raúl Porcel <armin76@gentoo.org> cmake-2.6.4-r3.ebuild:
ia64/s390/sh/sparc stable wrt #290723
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0523a97f92b2..1c8473f6a859 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,6 +9,6 @@ DIST cmake-2.8.0.tar.gz 3553247 RMD160 27e80a14b4970d85b12aaf18fbe738c02dc0620f
EBUILD cmake-2.6.4-r1.ebuild 3485 RMD160 d5563d0db93b1936e350feb9755b318d5cb94bb2 SHA1 b446894b3e0efb73532a0d4e95d47c3b31a7684e SHA256 bb7e274284bcac0981bcc3fa749a8a71a211b2d3096f7c079e91513a3264d84f
EBUILD cmake-2.6.4-r3.ebuild 3476 RMD160 e20f6f85b5291ced7e3ee53ff933a0da704b8f14 SHA1 72bb72aeea2261d1c5c5642018234803c35c32c5 SHA256 1c4a2f60dffb72d1134932b580e46d07a7784420a0c786f204d4b71dbfd928f0
EBUILD cmake-2.6.4.ebuild 3436 RMD160 a15fa36719f3581fa67c9d7e64c3ac5d55719a6e SHA1 0200e57a666461d4840164a52221b80e4f72636b SHA256 619d8daff2df4ec92265550c42717f2e3301497d37f4d0fc0c638af359da6d67
-EBUILD cmake-2.8.0.ebuild 3262 RMD160 cedb9bf905e8d092f96517dd19bdd5fa3e613088 SHA1 117523d82b50179d4ffb16b3d9a17e1769fb0176 SHA256 632c1d186c33f4a1442d0e2ae94edfa375665e3c2eaf46a4d818290422a4bd3b
-MISC ChangeLog 18379 RMD160 9e6c25a15811b46843dc9d31a3327cf4ba788cd3 SHA1 df4419b37ee36e67860cee97e97a700c42887304 SHA256 9aa8960e2b51f9b314e2ba53748fee7def8d406bee56d8daa9faa2130d49a85c
+EBUILD cmake-2.8.0.ebuild 3344 RMD160 b7774e0559cf51a8ea6556296744307aa3696690 SHA1 c35ea03dbdcdb4e02217ddd7d544162e67a1ec7e SHA256 004ec7052cb02dbb05b8f4b477b4b87e1207ac3cfef0f07bdcdac11dbf621e80
+MISC ChangeLog 18550 RMD160 ea56855b4ff2e345db6515e4b800e6f3ee98965c SHA1 2f245934537dc598c1daba2fa740f35f20792d70 SHA256 9ac52a04ea66ec7a92d6821030a57cc905f1a118206e961753a2827c8ed03d11
MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.8.0.ebuild b/dev-util/cmake/cmake-2.8.0.ebuild
index 6b1457ae5044..8dcbb9b604ae 100644
--- a/dev-util/cmake/cmake-2.8.0.ebuild
+++ b/dev-util/cmake/cmake-2.8.0.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/dev-util/cmake/cmake-2.8.0.ebuild,v 1.1 2009/11/14 01:01:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0.ebuild,v 1.2 2009/11/29 18:01:05 scarabeus Exp $
EAPI="2"
@@ -18,7 +18,11 @@ SLOT="0"
IUSE="emacs qt4 vim-syntax"
DEPEND="
- >=net-misc/curl-7.16.4
+ || (
+ >=net-misc/curl-7.16.7[gnutls]
+ >=net-misc/curl-7.16.7[nss]
+ >=net-misc/curl-7.16.7[openssl]
+ )
>=dev-libs/expat-2.0.1
>=dev-libs/libxml2-2.6.28
>=dev-libs/xmlrpc-c-1.06.27[curl]