Tweak dependency to use older gloox only

(Portage version: 2.1.4_rc14)

6 files changed, 9 insertions, 69 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/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