Version bump, bug #375213 thank pavel sanda for report. Drop old.

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

6 files changed, 66 insertions, 135 deletions

diff --git a/net-im/climm/ChangeLog b/net-im/climm/ChangeLog
index fb2b9510dd5e..31c34b931ff5 100644
--- a/net-im/climm/ChangeLog
+++ b/net-im/climm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/climm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.14 2010/05/16 19:54:57 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/ChangeLog,v 1.15 2011/07/25 12:12:00 pva Exp $
+
+*climm-0.7.1 (25 Jul 2011)
+
+  25 Jul 2011; Peter Volkov <pva@gentoo.org> -climm-0.6.3.ebuild,
+  -climm-0.6.4.ebuild, +climm-0.7.1.ebuild, metadata.xml:
+  Version bump, bug #375213 thank pavel sanda for report. Drop old.
 
   16 May 2010; Markus Meier <maekke@gentoo.org> climm-0.7.ebuild:
   amd64/x86 stable, bug #311855
diff --git a/net-im/climm/Manifest b/net-im/climm/Manifest
index 089ec62fbb19..259f6ba00931 100644
--- a/net-im/climm/Manifest
+++ b/net-im/climm/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX climm-0.7-gnutls.patch 513 RMD160 13f41686a97d7d421468c2c1a83e0bed2843eb25 SHA1 6ba3c0b785c2d1f29910fe88e55f4a014a86f3f7 SHA256 7090e0fa669ad2739161a7631ffbfc9a640a26433edaa961e2afbac7e2dc8823
-DIST climm-0.6.3.tgz 1189460 RMD160 849fe9185bb93d94ffd18289d837f4c51061192b SHA1 ea4a17d4ad86f25719957ca906dd9d46e00caaa9 SHA256 1492ff07b901446e70a53fa2c9ae858becea43cd56ee04e1b4de68506595768e
-DIST climm-0.6.4.tgz 1209914 RMD160 71b0a4c1d64c928d43b1a7b7cfc702921f24bfe8 SHA1 4e0e99b6745a2826543fcb82608f427ffc7d9a67 SHA256 c87f17bf52e1b2b29b840ba7994762609d75acd89857560209915d7584d8587b
+DIST climm-0.7.1.tgz 1296303 RMD160 c2780ad206a6a3b0a46e0dcd4e3e9e5a0a5815fd SHA1 d4220f6d58714ecd312f9dea6015d9ca8e1661d7 SHA256 6212ada46947f0572fb6734b920a2cfd91b6a632cbd044d87476791a318af052
 DIST climm-0.7.tgz 1232812 RMD160 c5fc35092ea8d793f287882421fde711e64dc31b SHA1 c11a87a62fe060ff0d28fc513c22feee247000d2 SHA256 13d38caa74d16b9f98e44ffc06ee447a515fe8b571ff5a4d871b24a210248bc6
-EBUILD climm-0.6.3.ebuild 1362 RMD160 0748a2b572cdc251420fe2894796be9805f2220e SHA1 73d060ac9132fad4969e35d5b52d30205ac324da SHA256 7e208fa8a5d31bd351863ffba9c7efe107efee701a72b5f6442270e7f4d77087
-EBUILD climm-0.6.4.ebuild 1364 RMD160 d1c2befd74aced333d9ea34fc09a8fbca66e3d03 SHA1 3ed46c93169b730968043dc8dc0132dfe4380b7c SHA256 4a5c6a0ccbbe70ae64ec07e7107a4a4b760f5106055d2fbc9077dfd96d6ac48e
+EBUILD climm-0.7.1.ebuild 1422 RMD160 dc8741b74689ef437454079eb219a79a6a37b58b SHA1 ae887ce61d72e651858d4f388663f078919049d7 SHA256 c7f7a1600619cd9f232e01104cc522db7d21ba3f0356eebd384274782048bdaa
 EBUILD climm-0.7.ebuild 1885 RMD160 86ba077ed1af225810739dd8658b80a623c70297 SHA1 f3e9d3681271bf54743ff37527f19f4be997814f SHA256 48b64aa1a12b79fd2daf2ca4fba680803f638e44c02f6e3a42ae11e05009f22f
-MISC ChangeLog 2483 RMD160 58e9c99499cccc41ed7217917270c25f4153aff7 SHA1 4d2bd4a797a9c17f4fa916e6f6dd95c380032557 SHA256 f4470630edaf99fbb775096ad706209c4c368976eb8d71aee525b3ca844b50e2
-MISC metadata.xml 389 RMD160 6d54c544b141ca55ffb884e15ca93d6f93376b7b SHA1 c863182d33d0aa532b2979b476b6380bd0b3cee2 SHA256 3d7e645532119d53b818e9c44db88b636d7d799fb72a8428f41410191a2d1320
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvwTT8ACgkQkKaRLQcq0GIhEACeJaSTULQbL9uKW71FfwPECqE9
-NjYAoIxEGctNkCBmbu9/lHRitgOzkQIN
-=01Eq
------END PGP SIGNATURE-----
+MISC ChangeLog 2701 RMD160 83e1dee1be46f7228cf63a52fe8226f1b5ae7c34 SHA1 13ce12a5dfd28037e648c4df08c85a10bfe85ad3 SHA256 2d54ca126ff70ae1e5810ed6d6fc4523a9cf4efa81743413c5f629cb44763124
+MISC metadata.xml 319 RMD160 dae5684c14e4b6a3ff987d0ca48baaf92fd999cc SHA1 f8e528347f85a22bdb0d9c30aef49aa2e525266b SHA256 c92bbb7b2d30eab2ba80841de4dbd0e3691e0e44198a71db9b54b8c8b133391f
diff --git a/net-im/climm/climm-0.6.3.ebuild b/net-im/climm/climm-0.6.3.ebuild
deleted file mode 100644
index 1fbecdae1910..000000000000
--- a/net-im/climm/climm-0.6.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.2 2009/02/01 17:18:54 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 )
-	gnutls? ( >=net-libs/gnutls-0.8.10 )
-	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.4.ebuild b/net-im/climm/climm-0.6.4.ebuild
deleted file mode 100644
index 73a9cac9fa78..000000000000
--- a/net-im/climm/climm-0.6.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.4.ebuild,v 1.1 2009/02/23 19:36:59 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 )
-	gnutls? ( >=net-libs/gnutls-0.8.10 )
-	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.7.1.ebuild b/net-im/climm/climm-0.7.1.ebuild
new file mode 100644
index 000000000000..d3f54f420b6b
--- /dev/null
+++ b/net-im/climm/climm-0.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/climm/climm-0.7.1.ebuild,v 1.1 2011/07/25 12:12:00 pva Exp $
+
+EAPI="4"
+
+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="jabber gnutls otr tcl ssl"
+
+# In case user don't need jabber there is a choice gnutls/openssl. Since jabber
+# requires gnutls then without explicit request to use gnutls (USE=gnutls)
+# for ssl we fall back on gnutls instead of openssl.
+REQUIRED_USE="jabber? ( ssl gnutls )"
+
+RDEPEND="jabber? ( || ( >=dev-libs/iksemel-1.4[ssl] >=dev-libs/iksemel-1.3[gnutls] ) )
+	ssl? ( gnutls? ( >=net-libs/gnutls-0.8.10
+					dev-libs/libgcrypt )
+			!gnutls? ( dev-libs/openssl ) )
+	tcl? ( dev-lang/tcl )
+	otr? ( >=net-libs/libotr-3.0.0 )"
+DEPEND="${RDEPEND}
+	ssl? ( gnutls? ( dev-util/pkgconfig ) )"
+
+src_configure() {
+	local myconf
+	if use ssl; then
+		if use gnutls; then
+			einfo "Using gnutls"
+			myconf="--enable-ssl=gnutls"
+		else
+			einfo "Using openSSL"
+			myconf="--enable-ssl=openssl"
+		fi
+	else
+		myconf="--disable-ssl"
+	fi
+
+	econf \
+		$(use_enable jabber xmpp) \
+		$(use_enable otr) \
+		$(use_enable tcl) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+}
diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
index 6018d647ad8e..7761310a82c7 100644
--- a/net-im/climm/metadata.xml
+++ b/net-im/climm/metadata.xml
@@ -7,7 +7,6 @@
   <name>Markus Ullmann</name>
 </maintainer>
 <use>
-	<flag name='gloox'>Enable support for Jabber/XMPP using gloox</flag>
 	<flag name='otr'>Enable encrypted conversations</flag>
 </use>
 </pkgmetadata>