Tweak dependency to use older gloox only

Package-Manager: portage-2.1.4_rc14

7 files changed, 20 insertions, 95 deletions

diff --git a/net-im/climm/ChangeLog b/net-im/climm/ChangeLog
index 42ec607d47f0..700cbe92429a 100644
--- a/net-im/climm/ChangeLog
+++ b/net-im/climm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/climm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.5 2007/12/05 21:57:35 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.6 2008/01/08 17:38:53 jokey Exp $
+
+  08 Jan 2008; Markus Ullmann <jokey@gentoo.org> -climm-0.6.ebuild,
+  -climm-0.6.1.ebuild, climm-0.6.1-r1.ebuild:
+  Tweak dependency to use older gloox only
 
   05 Dec 2007; Markus Ullmann <jokey@gentoo.org> climm-0.6.1-r1.ebuild:
   Fix up gnutls dep as notified in bug #198132
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
index 4b0b2c4ea872..5d3a4001de08 100644
--- a/net-im/climm/Manifest
+++ b/net-im/climm/Manifest
@@ -2,40 +2,25 @@
 Hash: SHA1
 
 DIST climm-0.6.1.tgz 1177518 RMD160 11ec17ee64515c03eff621168200cb4ea0ada405 SHA1 d4b60397d22f7232faedc877810bfbd34f5b3aeb SHA256 900b054c4cfc27e3f0363038705eaee5c2457a0b3d0ae5e587deaf7cfb94eea2
-DIST climm-0.6.tgz 1173313 RMD160 6bf717d3584462e408524790bdd6489cb95c1ce1 SHA1 a9a005db723d44a21a1cfdcba4be85d1c9b4a8c4 SHA256 ec0d0288a3e1fcde6d7d07f1371a5da25b12645d8868ed02500452ff9a6199cb
-EBUILD climm-0.6.1-r1.ebuild 1335 RMD160 6fc4c7429ffa7a3ca635bf23de36fd37cedf781b SHA1 5be7c126d09b04450bb0ab22236c5778e9f3c9b8 SHA256 6b4fcdd86dda2ca8f502594ce956c95bda81f0a69efc2d1e3b6da9d432baa106
-MD5 905bfea10558cafe6c3a909fef707924 climm-0.6.1-r1.ebuild 1335
-RMD160 6fc4c7429ffa7a3ca635bf23de36fd37cedf781b climm-0.6.1-r1.ebuild 1335
-SHA256 6b4fcdd86dda2ca8f502594ce956c95bda81f0a69efc2d1e3b6da9d432baa106 climm-0.6.1-r1.ebuild 1335
-EBUILD climm-0.6.1.ebuild 773 RMD160 c87fc597ef369b34a07a57aa19634e0f7781663e SHA1 a497b07d9cd2dcd96fb69a354b1aea264459a499 SHA256 2bf7550f9f484d2c6eb48913ddca4bf30cde46dbd2d36db5210b5659d8340d8d
-MD5 564ceda514a3a8710a3d1184ef383f91 climm-0.6.1.ebuild 773
-RMD160 c87fc597ef369b34a07a57aa19634e0f7781663e climm-0.6.1.ebuild 773
-SHA256 2bf7550f9f484d2c6eb48913ddca4bf30cde46dbd2d36db5210b5659d8340d8d climm-0.6.1.ebuild 773
-EBUILD climm-0.6.ebuild 771 RMD160 6123fe2e98e819ae5fcd397090438d7a97d882d5 SHA1 8d346b47748c3c1354e6742337b035b064e70365 SHA256 bbc0d400268e14ae433ff1fd517f77186385ed6fe31be72b129c660cd8f53c8d
-MD5 b01ab9121a8a2befd1b5ecab7d54b9ef climm-0.6.ebuild 771
-RMD160 6123fe2e98e819ae5fcd397090438d7a97d882d5 climm-0.6.ebuild 771
-SHA256 bbc0d400268e14ae433ff1fd517f77186385ed6fe31be72b129c660cd8f53c8d climm-0.6.ebuild 771
-MISC ChangeLog 1059 RMD160 2b42affb07d1c644e8b7cf236970e76a07b7cd22 SHA1 3a3514f72af9c27cc6953a1af3dbb90b215a7370 SHA256 48d9e1189814caacfe3b57b898c5e7182e152c5f5f86c560bee83c7f920c6bc3
-MD5 d52f48865a6d694b83007ca0f1ac2d5c ChangeLog 1059
-RMD160 2b42affb07d1c644e8b7cf236970e76a07b7cd22 ChangeLog 1059
-SHA256 48d9e1189814caacfe3b57b898c5e7182e152c5f5f86c560bee83c7f920c6bc3 ChangeLog 1059
+EBUILD climm-0.6.1-r1.ebuild 1340 RMD160 da4a5898386457b22b44868170689c3abb9c730d SHA1 c2a6d089fb2c39e4276ec140729a876772c158b4 SHA256 fdbf8dd8767b61fc842c9c9206997cc8c2add3b9716754eb409a7512d49bf618
+MD5 9414926848e2d7a5c9f67d3a18ba492f climm-0.6.1-r1.ebuild 1340
+RMD160 da4a5898386457b22b44868170689c3abb9c730d climm-0.6.1-r1.ebuild 1340
+SHA256 fdbf8dd8767b61fc842c9c9206997cc8c2add3b9716754eb409a7512d49bf618 climm-0.6.1-r1.ebuild 1340
+MISC ChangeLog 1217 RMD160 92867836cb448c5d335575b0058be03967651453 SHA1 625fba6d6784ab0247ddc61daa2fcd0f4393a5aa SHA256 0b5878ded070c5dcf41ba24ac092852964c3c2320be44048307a949a8161202c
+MD5 2d94b68c90902305ccdcc8e24552c5db ChangeLog 1217
+RMD160 92867836cb448c5d335575b0058be03967651453 ChangeLog 1217
+SHA256 0b5878ded070c5dcf41ba24ac092852964c3c2320be44048307a949a8161202c ChangeLog 1217
 MISC metadata.xml 250 RMD160 b6e51a264e1584f783bd491505e99523d2ea6ebf SHA1 adf080dc000855fff7cb5595582e3b1acfe62dca SHA256 9f906a6688066a1ded86eb663ff87e162ac0d2e4c02a22f73fc158323bec0a61
 MD5 4d2cb8d36da15cc6069c5e4cd8051f7a metadata.xml 250
 RMD160 b6e51a264e1584f783bd491505e99523d2ea6ebf metadata.xml 250
 SHA256 9f906a6688066a1ded86eb663ff87e162ac0d2e4c02a22f73fc158323bec0a61 metadata.xml 250
-MD5 d55bb69981765f2109c9552059177be0 files/digest-climm-0.6 223
-RMD160 ca82dc372a43eeee7b0fd61a9d6a50a3345d1944 files/digest-climm-0.6 223
-SHA256 484c95446a04948adc4e26dfc437dd28d342c1687d99ab7fe642f3dc7c5611de files/digest-climm-0.6 223
-MD5 756393e7e027cba22d6a19d17af19658 files/digest-climm-0.6.1 229
-RMD160 fb2f31f192e31a8eab39fb5be55d36903996a271 files/digest-climm-0.6.1 229
-SHA256 ad0d493a202ada53e821ee9d3d952e35ed6e47d5d0d8db819fcd1374bf843191 files/digest-climm-0.6.1 229
 MD5 756393e7e027cba22d6a19d17af19658 files/digest-climm-0.6.1-r1 229
 RMD160 fb2f31f192e31a8eab39fb5be55d36903996a271 files/digest-climm-0.6.1-r1 229
 SHA256 ad0d493a202ada53e821ee9d3d952e35ed6e47d5d0d8db819fcd1374bf843191 files/digest-climm-0.6.1-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHVx7Zz974XjDVpbkRAgOIAKDWxgS/KiHIAMw+SJfWUVajpIe6pQCcDKo8
-mo9gp5Mo3xIw1+9PGdmHTZY=
-=qtyo
+iD8DBQFHg7U2z974XjDVpbkRAmPQAJwIhQW66bjN6mAJ6bNz67reTcVTNgCgksGA
+Tioije+FvLN3aF48R5leE7U=
+=kmeO
 -----END PGP SIGNATURE-----
diff --git a/net-im/climm/climm-0.6.1-r1.ebuild b/net-im/climm/climm-0.6.1-r1.ebuild
index 037e684367fe..0980eb92a3aa 100644
--- a/net-im/climm/climm-0.6.1-r1.ebuild
+++ b/net-im/climm/climm-0.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v 1.3 2007/12/05 21:57:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1-r1.ebuild,v 1.4 2008/01/08 17:38:53 jokey Exp $
 
 DESCRIPTION="ICQ text-mode client with many features"
 HOMEPAGE="http://www.climm.org/"
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gloox gnutls otr tcl ssl"
 
-DEPEND="gloox? ( net-libs/gloox )
+DEPEND="gloox? ( <net-libs/gloox-0.9 )
 	ssl? (
 		|| ( gnutls? ( >=net-libs/gnutls-0.8.10 )
 		dev-libs/openssl ) )
diff --git a/net-im/climm/climm-0.6.1.ebuild b/net-im/climm/climm-0.6.1.ebuild
deleted file mode 100644
index 55b6cd4f60a7..000000000000
--- a/net-im/climm/climm-0.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.1.ebuild,v 1.2 2007/10/22 21:51:36 jokey Exp $
-
-DESCRIPTION="ICQ text-mode client with many features"
-HOMEPAGE="http://www.climm.org/"
-SRC_URI="http://www.climm.org/source/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="tcl ssl"
-
-DEPEND="ssl? ( >=net-libs/gnutls-0.8.10 dev-libs/openssl )
-	tcl? ( dev-lang/tcl )"
-
-src_compile() {
-	econf \
-		$(use_enable tcl) \
-		$(use_enable ssl) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
-}
diff --git a/net-im/climm/climm-0.6.ebuild b/net-im/climm/climm-0.6.ebuild
deleted file mode 100644
index 4a8b37e255eb..000000000000
--- a/net-im/climm/climm-0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.ebuild,v 1.2 2007/10/22 21:51:36 jokey Exp $
-
-DESCRIPTION="ICQ text-mode client with many features"
-HOMEPAGE="http://www.climm.org/"
-SRC_URI="http://www.climm.org/source/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="tcl ssl"
-
-DEPEND="ssl? ( >=net-libs/gnutls-0.8.10 dev-libs/openssl )
-	tcl? ( dev-lang/tcl )"
-
-src_compile() {
-	econf \
-		$(use_enable tcl) \
-		$(use_enable ssl) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
-}
diff --git a/net-im/climm/files/digest-climm-0.6 b/net-im/climm/files/digest-climm-0.6
deleted file mode 100644
index 21692fd77ca8..000000000000
--- a/net-im/climm/files/digest-climm-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 290a2724182a46170737f1fe46e9b4a3 climm-0.6.tgz 1173313
-RMD160 6bf717d3584462e408524790bdd6489cb95c1ce1 climm-0.6.tgz 1173313
-SHA256 ec0d0288a3e1fcde6d7d07f1371a5da25b12645d8868ed02500452ff9a6199cb climm-0.6.tgz 1173313
diff --git a/net-im/climm/files/digest-climm-0.6.1 b/net-im/climm/files/digest-climm-0.6.1
deleted file mode 100644
index 3cee7d73797b..000000000000
--- a/net-im/climm/files/digest-climm-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d315eac8ee64179ad1cceb2c3681b18c climm-0.6.1.tgz 1177518
-RMD160 11ec17ee64515c03eff621168200cb4ea0ada405 climm-0.6.1.tgz 1177518
-SHA256 900b054c4cfc27e3f0363038705eaee5c2457a0b3d0ae5e587deaf7cfb94eea2 climm-0.6.1.tgz 1177518