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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 13 insertions, 135 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/Manifest b/net-im/climm/Manifest
index aaa1f6d3b40d..457c328b3a3c 100644
--- a/net-im/climm/Manifest
+++ b/net-im/climm/Manifest
@@ -1,18 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST climm-0.6.1.tgz 1177518 RMD160 11ec17ee64515c03eff621168200cb4ea0ada405 SHA1 d4b60397d22f7232faedc877810bfbd34f5b3aeb SHA256 900b054c4cfc27e3f0363038705eaee5c2457a0b3d0ae5e587deaf7cfb94eea2
-DIST climm-0.6.2.tgz 1190182 RMD160 7a52b4d26456c1068707e5cc3bafdbad31a28e2a SHA1 42ab55aa576a9ab0b51d83b38dc06af1a5467941 SHA256 25e0aca09981f65eef2f77f61b8580a99b690f4a3ae9cf1441151ad551c5812d
 DIST climm-0.6.3.tgz 1189460 RMD160 849fe9185bb93d94ffd18289d837f4c51061192b SHA1 ea4a17d4ad86f25719957ca906dd9d46e00caaa9 SHA256 1492ff07b901446e70a53fa2c9ae858becea43cd56ee04e1b4de68506595768e
-EBUILD climm-0.6.1-r1.ebuild 1334 RMD160 4337f8ab3230e0a341006daa337a35befc3b1f17 SHA1 86e3f660ae1ef24948d64b19ff202cdc5ac7deed SHA256 319c53e3eaba16bace641418c8b617c2dcafb34e223300ac280a1a09149ba342
-EBUILD climm-0.6.2.ebuild 1326 RMD160 ce27b3c13d09e33e96d7669af5e095f7937bea84 SHA1 3e2e6f79cc481b6448e44a04b381a7b95ea8c38d SHA256 24a1747a89862b7864147a2623b7a7bcada0e51e45ecd4cfc1b49ef8b3129568
-EBUILD climm-0.6.3.ebuild 1326 RMD160 bdb8f43ce0cf17c6311e7fe5b1c49486e2a22144 SHA1 a2176169162bf2e24eceab3f46c9337c3feb70a9 SHA256 4a117818817bd083e16f52e171c1f23114e94bfff48ed0c36811c33d1e4e256b
-MISC ChangeLog 1799 RMD160 ee58c63278a1daad7b55bdf036686c15d62e2171 SHA1 95a92962f8180c2bd7a64265fe17c8172b6519c3 SHA256 7e8d6e986f6c35577345cbe9c83e1b55ece1f73754860b218fc47e7a3a5f583a
+EBUILD climm-0.6.3.ebuild 1362 RMD160 0748a2b572cdc251420fe2894796be9805f2220e SHA1 73d060ac9132fad4969e35d5b52d30205ac324da SHA256 7e208fa8a5d31bd351863ffba9c7efe107efee701a72b5f6442270e7f4d77087
+MISC ChangeLog 2001 RMD160 4345cd1ac339e6d58d9b0927ab00987315a2351d SHA1 0c6f3fc465e12205d98b7fb99cbca80d1f14cec5 SHA256 1cdf166d381bbfbcc1db5f645360746181710487561aeb037fc0ece725f1597c
 MISC metadata.xml 389 RMD160 6d54c544b141ca55ffb884e15ca93d6f93376b7b SHA1 c863182d33d0aa532b2979b476b6380bd0b3cee2 SHA256 3d7e645532119d53b818e9c44db88b636d7d799fb72a8428f41410191a2d1320
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki1aLUACgkQz974XjDVpbkalQCfcVaU3ixgIOJ280otm1rM+cuK
-MDUAoLHd3Na2GcDlmYQ9x1S16CqCCC/E
-=R2pi
------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
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 ) )