Pull in gnutls if requested and satisfy ssl dep with it, stable on x86 and amd64

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 11 insertions, 119 deletions

diff --git a/net-im/climm/ChangeLog b/net-im/climm/ChangeLog
index a33c92c15885..2b09866f45f3 100644
--- a/net-im/climm/ChangeLog
+++ b/net-im/climm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/climm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.10 2008/08/27 14:46:14 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.11 2009/02/01 17:18:54 jokey Exp $
+
+  01 Feb 2009; Markus Ullmann <jokey@gentoo.org> -climm-0.6.1-r1.ebuild,
+  -climm-0.6.2.ebuild, climm-0.6.3.ebuild:
+  Pull in gnutls if requested and satisfy ssl dep with it, stable on x86 and
+  amd64
 
 *climm-0.6.3 (27 Aug 2008)
 
diff --git a/net-im/climm/climm-0.6.1-r1.ebuild b/net-im/climm/climm-0.6.1-r1.ebuild
deleted file mode 100644
index 5636d6002384..000000000000
--- a/net-im/climm/climm-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.5 2008/02/10 18:56:06 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="~amd64 ~x86"
-IUSE="gloox gnutls otr tcl ssl"
-
-DEPEND="gloox? ( <net-libs/gloox-0.9 )
-	ssl? (
-		|| ( gnutls? ( >=net-libs/gnutls-0.8.10 )
-		dev-libs/openssl ) )
-	tcl? ( dev-lang/tcl )
-	otr? ( >=net-libs/libotr-3.0.0 )"
-
-pkg_setup() {
-	if use gloox && ! use ssl ; then
-		eerror "You need to set the ssl flag when you want to use the gloox"
-		eerror "Jabber library"
-		die "Set ssl or unset gloox for ${PN}"
-	fi
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		if ! use gnutls ; then
-			elog "Using openSSL"
-			myconf="--enable-ssl=openssl"
-		else
-			elog "Using gnutls"
-			myconf="--enable-ssl=gnutls"
-		fi
-	else
-		myconf="--disable-ssl"
-	fi
-
-	econf \
-		$(use_enable gloox) \
-		$(use_enable otr) \
-		$(use_enable ssl) \
-		$(use_enable tcl) \
-		${myconf} \
-		|| 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.2.ebuild b/net-im/climm/climm-0.6.2.ebuild
deleted file mode 100644
index 03caa1317a4a..000000000000
--- a/net-im/climm/climm-0.6.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.2.ebuild,v 1.1 2008/03/04 20:49:02 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="~amd64 ~x86"
-IUSE="gloox gnutls otr tcl ssl"
-
-DEPEND="gloox? ( net-libs/gloox )
-	ssl? (
-		|| ( gnutls? ( >=net-libs/gnutls-0.8.10 )
-		dev-libs/openssl ) )
-	tcl? ( dev-lang/tcl )
-	otr? ( >=net-libs/libotr-3.0.0 )"
-
-pkg_setup() {
-	if use gloox && ! use ssl ; then
-		eerror "You need to set the ssl flag when you want to use the gloox"
-		eerror "Jabber library"
-		die "Set ssl or unset gloox for ${PN}"
-	fi
-}
-
-src_compile() {
-	local myconf
-	if use ssl ; then
-		if ! use gnutls ; then
-			elog "Using openSSL"
-			myconf="--enable-ssl=openssl"
-		else
-			elog "Using gnutls"
-			myconf="--enable-ssl=gnutls"
-		fi
-	else
-		myconf="--disable-ssl"
-	fi
-
-	econf \
-		$(use_enable gloox) \
-		$(use_enable otr) \
-		$(use_enable ssl) \
-		$(use_enable tcl) \
-		${myconf} \
-		|| 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.3.ebuild b/net-im/climm/climm-0.6.3.ebuild
index b53af7995107..1fbecdae1910 100644
--- a/net-im/climm/climm-0.6.3.ebuild
+++ b/net-im/climm/climm-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.3.ebuild,v 1.1 2008/08/27 14:46:14 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.6.3.ebuild,v 1.2 2009/02/01 17:18:54 jokey Exp $
 
 DESCRIPTION="ICQ text-mode client with many features"
 HOMEPAGE="http://www.climm.org/"
@@ -8,10 +8,11 @@ SRC_URI="http://www.climm.org/source/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gloox gnutls otr tcl ssl"
 
 DEPEND="gloox? ( net-libs/gloox )
+	gnutls? ( >=net-libs/gnutls-0.8.10 )
 	ssl? (
 		|| ( gnutls? ( >=net-libs/gnutls-0.8.10 )
 		dev-libs/openssl ) )