diff options
author | Peter Volkov <pva@gentoo.org> | 2011-07-25 12:12:00 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2011-07-25 12:12:00 +0000 |
commit | 1d91b8043550edb78c1d1b8a8a5e2352e7e4e29b (patch) | |
tree | 8f32026b3c32cdf187efc0d74933d491621d729d /net-im | |
parent | Fix tests when building with USE=-virt-network. (diff) | |
download | gentoo-2-1d91b8043550edb78c1d1b8a8a5e2352e7e4e29b.tar.gz gentoo-2-1d91b8043550edb78c1d1b8a8a5e2352e7e4e29b.tar.bz2 gentoo-2-1d91b8043550edb78c1d1b8a8a5e2352e7e4e29b.zip |
Version bump, bug #375213 thank pavel sanda for report. Drop old.
(Portage version: 2.1.10.6/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/climm/ChangeLog | 10 | ||||
-rw-r--r-- | net-im/climm/climm-0.6.3.ebuild | 58 | ||||
-rw-r--r-- | net-im/climm/climm-0.6.4.ebuild | 58 | ||||
-rw-r--r-- | net-im/climm/climm-0.7.1.ebuild | 54 | ||||
-rw-r--r-- | net-im/climm/metadata.xml | 1 |
5 files changed, 62 insertions, 119 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/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> |