summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2009-11-14 10:19:21 +0000
committerSven Wegener <swegener@gentoo.org>2009-11-14 10:19:21 +0000
commit232de7a8ada1c1d06ccc19ff539a1a7ca7559778 (patch)
treeca01319b51d4ee7417687ff36e8b7585e498707a /net-im/centerim
parentversion bump (diff)
downloadhistorical-232de7a8ada1c1d06ccc19ff539a1a7ca7559778.tar.gz
historical-232de7a8ada1c1d06ccc19ff539a1a7ca7559778.tar.bz2
historical-232de7a8ada1c1d06ccc19ff539a1a7ca7559778.zip
Fix net-misc/curl dependency to also match on the gnutls and nss USE flags, we only need SSL support and not one specific implementation.
Package-Manager: portage-2.2_rc49/cvs/Linux x86_64
Diffstat (limited to 'net-im/centerim')
-rw-r--r--net-im/centerim/ChangeLog6
-rw-r--r--net-im/centerim/Manifest14
-rw-r--r--net-im/centerim/centerim-4.22.8.ebuild15
3 files changed, 24 insertions, 11 deletions
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 1dd79d0d398b..00637acb0b44 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/centerim
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.38 2009/11/07 22:55:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.39 2009/11/14 10:19:21 swegener Exp $
+
+ 14 Nov 2009; Sven Wegener <swegener@gentoo.org> centerim-4.22.8.ebuild:
+ Fix net-misc/curl dependency to also match on the gnutls and nss USE
+ flags, we only need SSL support and not one specific implementation.
07 Nov 2009; Daniel Black <dragonheart@gentoo.org>
centerim-4.22.7-r1.ebuild, centerim-4.22.8.ebuild:
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index c3725c370073..4e1938c25470 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX centerim-4.22.7-libgadu-CVE-2008-4776.patch 555 RMD160 7e9c908827544aef065f0091b0eb94d44d89f4a6 SHA1 28ab98f6561f8f8773f90c664d15a3a55b02dc6e SHA256 d13bd5f672e24036cd9ce1884da96fe11f27a439cfd9ca27ec2d6ce7ba3d41fc
DIST centerim-4.22.7.tar.bz2 1794779 RMD160 83c579db34fe6e7c5d539cf78102a2de6b89f47a SHA1 c0b3433ed260fca23f8e10999c1cf91895489b35 SHA256 59356d55d7fb293809d8d26fdef6bcb07bf3dd1452e11e3798ac3550cba5efcd
DIST centerim-4.22.8.tar.gz 2259911 RMD160 10a3f50e87f792d09f8f570034eeeae7a800a2ff SHA1 3fce70fe1b9fe14a30b57ffb03d2640d95d61f95 SHA256 c585ffc6ee73e0fb47723654fcffe021caf6153e22e78b49c90b497218ac5dcd
EBUILD centerim-4.22.7-r1.ebuild 2762 RMD160 c4b27e4d60bbfa23982a589b851ff77876ac646e SHA1 2673eccf3d8b58b463cb11e77aaf7aaa5818a50b SHA256 756a4fbcb873b07c40781166da9048aad39e159ddbcf058f41d7a632c87d6444
-EBUILD centerim-4.22.8.ebuild 2688 RMD160 fa012c979e6f1dbe9eed27b21c9bf91232402671 SHA1 dabbdf209e35a37c057e84fce7b34a78f7704ead SHA256 dca9635553945eaa60cfd85a93a1bbcf1d6128d8bf859843c037ecc50a60d8a3
-MISC ChangeLog 6324 RMD160 817fbd1364c5ffa97ce8afbc04963c7e9c7e709b SHA1 8c3b1a130cbc47e9368149d761d0fbc6569577c9 SHA256 7571f85e29ad11684f089a7306af46fde526cdcba2782fad8bf41cca3ea40ae8
+EBUILD centerim-4.22.8.ebuild 2503 RMD160 d0455946c3be2b699a6c20432ae01daa77c0e20b SHA1 b3baa5bef33471cc5491128f9cd443d73868bdef SHA256 7819e7284d90853f3e268a4027a4789da97948dde0d418132e4aca4fb274c80f
+MISC ChangeLog 6538 RMD160 6d4c9516ed03b9096c62df94c46cbfb5ed17cbd7 SHA1 cc7c229b9a848b2c70aee5d043cc94ad0cf99aef SHA256 a5ee6046d3d7ed70241a4e798738db65b610e2c78b0f1f09cb1ae7d6bf0d3233
MISC metadata.xml 541 RMD160 27854f0c9356b45252baec904025bb06782f084e SHA1 591145cbbb6c177e36e498af16342dee1841157b SHA256 e7c1b47a4545dcb4d9502e3fd77da7f6d83d559e43da84e3428c5d298ee773f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkr+hC8ACgkQI1lqEGTUzyRRuQCgxM4gmn3UUcDqC2v5glDfgd3N
+/v4AnjitCSNFI2sdkO1EwSwgR61Y0KcW
+=ssSd
+-----END PGP SIGNATURE-----
diff --git a/net-im/centerim/centerim-4.22.8.ebuild b/net-im/centerim/centerim-4.22.8.ebuild
index 69176bbe6ee6..5ff6e939005e 100644
--- a/net-im/centerim/centerim-4.22.8.ebuild
+++ b/net-im/centerim/centerim-4.22.8.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/net-im/centerim/centerim-4.22.8.ebuild,v 1.3 2009/11/07 23:07:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.8.ebuild,v 1.4 2009/11/14 10:19:21 swegener Exp $
EAPI="2"
@@ -28,15 +28,14 @@ DEPEND=">=sys-libs/ncurses-5.2
crypt? ( >=app-crypt/gpgme-1.0.2 )
)
msn? (
- || ( <net-misc/curl-7.19.7[ssl] >=net-misc/curl-7.19.7[openssl] )
+ || (
+ <net-misc/curl-7.19.7[ssl]
+ >=net-misc/curl-7.19.7[openssl]
+ >=net-misc/curl-7.19.7[gnutls]
+ >=net-misc/curl-7.19.7[nss]
+ )
dev-libs/openssl
)"
-# dual curl dependancies added by dragonheart 20091108
-# as I transition between USE flags
-# I also note that curl hides its crypt so maybe this should be:
-# || ( net-misc/curl[ssl]
-# net-misc/curl[openssl] net-misc/curl[nss]
-# net-misc/curl[gnutls] )
RDEPEND="${DEPEND}
nls? ( sys-devel/gettext )"