USE=jabber -> USE=xmpp; fixes bug #362649.

Package-Manager: portage-2.2.0_alpha51_p49/cvs/Linux x86_64

diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index d183f63d5909192a46d23c2e8e746d911bde150d..2de76121c02d51028368546033d311cf56d6f950 100644 (file)
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/ekg2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.46 2011/04/06 15:42:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.47 2011/08/30 10:13:22 mgorny Exp $
+
+  30 Aug 2011; Michał Górny <mgorny@gentoo.org> ekg2-0.3.1-r1.ebuild:
+  USE=jabber -> USE=xmpp; fixes bug #362649.
 
 *ekg2-0.3.1-r1 (06 Apr 2011)
 

diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index f209a8bc3b963ba8ae8b6e2e9aa9110a577f2ea0..8a79bfb441c9e403bf2d4fe4656c16160ad84f4d 100644 (file)
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0001-Gentoo-use-vendor-dirs-for-perl-modules.patch 786 RMD160 7d0886f350a7a1e35ae5ee5d50ce6965deb41e60 SHA1 5c00c9c63f209218223f1880ba8c95111fa2d379 SHA256 774aadd44164565b198676d87431264b5e10e18af0664dafd1e6fa6f6ac9ac4d
 DIST ekg2-0.3.1.tar.gz 1704772 RMD160 5e06cfc855aa8a5266c166a59ed21174be454a74 SHA1 8b6f53086e8e1d2890fdc1ec274a7b1615da0fa1 SHA256 6ad360f8ca788d4f5baff226200f56922031ceda1ce0814e650fa4d877099c63
-EBUILD ekg2-0.3.1-r1.ebuild 3024 RMD160 6b5783f08fb47ef5346378ada393f04b92397d3a SHA1 bb3055c59dd1806275357a72f63cf7e563473526 SHA256 e29bf08dcba0ac8032ec3de9f8b5876a9166afbf998b03568285d337ea69ebb0
-MISC ChangeLog 3147 RMD160 867d9c538261fbbaa36fd03cde64d8aab28e07f1 SHA1 bf20f2c056bfe666e6f33c65b65200167d8ac6ef SHA256 8d1a474bd96a23775599f35b3f5e374ee66d3d4ea010f45a572e3147da2a2bb4
+EBUILD ekg2-0.3.1-r1.ebuild 3016 RMD160 3e11fcf3f522d2541d673d3a424f9717422a0f80 SHA1 59133c22f7e0ca4d4c0ab8e27d99ead3f226f86b SHA256 c579dcbc6d9d53daace9e6faa2c52ea576c0a17a87902a946dd4a1f857f3165c
+MISC ChangeLog 3265 RMD160 e8a90ef2d1200094520d1446316012d785a9dd6b SHA1 a67c4acbf85e36c63f1faee71af5695f9b435c70 SHA256 1dd895940d149a76ae6bf98890f41ea50e3ec698e00415c0b338dbb94e8e7370
 MISC metadata.xml 1408 RMD160 d4b8073fa85da36c447f9916dad66232e1d7fa65 SHA1 c3f8bb880e16201dfd82d45f3d9cfbd3969ec505 SHA256 ea2d7d73d284589b032ef27cbbeb660759e7f2cd8b909cf5f18c8744b001ae90
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2cihwACgkQnGSe5QXeB7tMFgCfcvewkntcFUObNDtxInKoyfab
-7tUAmwbuYix4RxmMPWdxlmAt63QJzR2G
-=mIYM
+iJwEAQEIAAYFAk5cuDgACgkQfXuS5UK5QB3UFwP8DdQR+QzPMg719OiqBn7N9BS9
+vOHrV1WJmpMaXHwyf4FDHKKTTWoKPj3zyG+sYNNhfBAKjgqWSXEMmIB/RZors6bh
+KGmqd+YLpdq2EPYbKYqiekx9V+0GIbf646fmKUP8DBB6xYXzM97Ec+JnVHLtlo7C
+dVNItupQVqkbS6nCdqQ=
+=17i0
 -----END PGP SIGNATURE-----

diff --git a/net-im/ekg2/ekg2-0.3.1-r1.ebuild b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
index e6854ab2ad3d1f4c5422db9b9207346c6e5bc28e..86ff6d4669471c981f55cad8aeed57bf6a6c4fed 100644 (file)
--- a/net-im/ekg2/ekg2-0.3.1-r1.ebuild
+++ b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.1 2011/04/06 15:42:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.2 2011/08/30 10:13:22 mgorny Exp $
 
 EAPI=3
 inherit autotools-utils versionator
@@ -12,9 +12,9 @@ SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gif gnutls gpg gpm gsm gtk idn inotify jabber jpeg ncurses nls
+IUSE="gadu gif gnutls gpg gpm gsm gtk idn inotify jpeg ncurses nls
        oracle perl python readline rss spell sqlite sqlite3 ssl threads unicode
-       xosd zlib"
+       xmpp xosd zlib"
 
 RDEPEND="
        gpg? ( app-crypt/gpgme )
@@ -22,9 +22,9 @@ RDEPEND="
        gtk? ( x11-libs/gtk+:2 )
        idn? ( net-dns/libidn )
        nls? ( virtual/libintl )
-       oracle? ( dev-db/oracle-instantclient-basic )
+       oracle? ( dev-db/oracle-instantclient-basic )
        perl? ( dev-lang/perl )
-       python? ( dev-lang/python )
+       python? ( dev-lang/python )
        readline? ( sys-libs/readline )
        ssl? ( dev-libs/openssl )
        xosd? ( x11-libs/xosd )
@@ -33,14 +33,14 @@ RDEPEND="
        gadu? ( net-libs/libgadu
                gif? ( media-libs/giflib )
                jpeg? ( virtual/jpeg ) )
-       jabber? ( dev-libs/expat
-               gnutls? ( net-libs/gnutls ) )
        ncurses? ( sys-libs/ncurses[unicode?]
                gpm? ( sys-libs/gpm )
                spell? ( app-text/aspell ) )
        rss? ( dev-libs/expat )
        sqlite3? ( dev-db/sqlite:3 )
-       !sqlite3? ( sqlite? ( dev-db/sqlite:0 ) )"
+       !sqlite3? ( sqlite? ( dev-db/sqlite:0 ) )
+       xmpp? ( dev-libs/expat
+               gnutls? ( net-libs/gnutls ) )"
 
 DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )"
@@ -76,14 +76,14 @@ src_configure() {
                $(use_with gadu libgadu)
                $(use_with gif)
                # gnutls is jabber-specific
-               $(use jabber && use_with gnutls libgnutls || echo '--without-libgnutls')
+               $(use xmpp && use_with gnutls libgnutls || echo '--without-libgnutls')
                $(use_with gpg)
                $(use_with gpm gpm-mouse)
                $(use_with gsm libgsm)
                $(use_with gtk)
                $(use_with idn libidn)
                $(use_with inotify)
-               $(use jabber && echo '--with-expat' || use_with rss expat)
+               $(use xmpp && echo '--with-expat' || use_with rss expat)
                $(use_with jpeg libjpeg)
                $(use_with ncurses)
                $(use_with oracle logsoracle)