From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QAqGl-000129-UF for garchives@archives.gentoo.org; Fri, 15 Apr 2011 21:09:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2F071C00C; Fri, 15 Apr 2011 21:09:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 691231C039 for ; Fri, 15 Apr 2011 21:09:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC6631B401E for ; Fri, 15 Apr 2011 21:09:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E8FAD80065 for ; Fri, 15 Apr 2011 21:09:25 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <7d3be142708f287350686ffd1e4ea3688d0dfa39.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: net-im/ekg2/ X-VCS-Repository: dev/mgorny X-VCS-Files: net-im/ekg2/Manifest net-im/ekg2/ekg2-9999.ebuild net-im/ekg2/metadata.xml X-VCS-Directories: net-im/ekg2/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7d3be142708f287350686ffd1e4ea3688d0dfa39 Date: Fri, 15 Apr 2011 21:09:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9298517ef764c911452cbe6061bec0c1 commit: 7d3be142708f287350686ffd1e4ea3688d0dfa39 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Apr 15 21:09:34 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Apr 15 21:09:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D7d3be142 net-im/ekg2: Cleanup the flags to prefer GnuTLS through ssl flag. Now ope= nssl is just used for sim plugin. (Portage version: 2.2.0_alpha29_p5/git/Linux x86_64, signed Manifest comm= it with key 05DE07BB) --- net-im/ekg2/Manifest | 10 +++++----- net-im/ekg2/ekg2-9999.ebuild | 17 ++++++----------- net-im/ekg2/metadata.xml | 7 +------ 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest index a0861de..ef83fc0 100644 --- a/net-im/ekg2/Manifest +++ b/net-im/ekg2/Manifest @@ -1,12 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 =20 -EBUILD ekg2-9999.ebuild 2625 RMD160 ce032fdb71a21a87abcf85cce5c35e9b1b5d= c135 SHA1 130476fa32b239bb8972f702edead7614746993e SHA256 b69046abab64272= 938050f81373d30a6dc24514644172bed2051e4dce9738465 -MISC metadata.xml 1283 RMD160 695e6ce291f4cea5d6e24f69d4090c1aa2afe6aa S= HA1 0f5f1e211989d496684414393dd82227dd893ad4 SHA256 c072e8406b05643781f9e= 6174c581cc81c78c16425d12ef472a923a0bfbaa8a5 +EBUILD ekg2-9999.ebuild 2451 RMD160 ec1b090d1f968f553539e1abb0f7994322d0= 9524 SHA1 1abf30ce305d680f081c34bd5929cabac91cdd7e SHA256 411a6d44f90e1f7= 5649098d943ccab81538f72cfcb347d70ec2c50cda3b335f2 +MISC metadata.xml 1010 RMD160 60fa2b46cc6825df00bd8ea7ac9c509c5a641d69 S= HA1 2ecff71970f8da2cac3c3207f8c35de54ee22228 SHA256 a2cde81d5a4f725753931= bd26f2fef464e6ee11b88e9825bb07d4b3e76b57d47 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iEYEARECAAYFAk2fUx8ACgkQnGSe5QXeB7sRkQCePM+BvnUfd482sDZn4SEeRox7 -I7EAniveUJsjZ4tayVUIxcqgbJAL2bCp -=3D5DKg +iEYEARECAAYFAk2otA4ACgkQnGSe5QXeB7upCQCgnZoGOIFzXezoBbuD1S97oHOF +b2IAn1XYk2FhsXVFtPBr98IbccepXs3E +=3DQuhI -----END PGP SIGNATURE----- diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild index e09a155..7d047e5 100644 --- a/net-im/ekg2/ekg2-9999.ebuild +++ b/net-im/ekg2/ekg2-9999.ebuild @@ -13,7 +13,7 @@ SRC_URI=3D"" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"" -IUSE=3D"gadu gnutls gpm gpg gtk inotify minimal ncurses nls nntp +IUSE=3D"gadu gpm gpg gtk inotify minimal ncurses nls nntp openssl perl python readline rss spell sqlite sqlite3 ssl xmpp unicode zlib" =20 RDEPEND=3D"dev-libs/glib:2 @@ -21,11 +21,12 @@ RDEPEND=3D"dev-libs/glib:2 gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) + openssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) readline? ( sys-libs/readline ) rss? ( dev-libs/expat ) - ssl? ( dev-libs/openssl ) + ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib ) =20 ncurses? ( sys-libs/ncurses[unicode=3D] @@ -33,8 +34,7 @@ RDEPEND=3D"dev-libs/glib:2 spell? ( app-text/aspell ) ) sqlite3? ( dev-db/sqlite:3 ) !sqlite3? ( sqlite? ( dev-db/sqlite:0 ) ) - xmpp? ( dev-libs/expat - gnutls? ( net-libs/gnutls ) )" + xmpp? ( dev-libs/expat )" =20 DEPEND=3D"${RDEPEND} sys-devel/gettext" @@ -52,11 +52,6 @@ pkg_setup() { ewarn 'enabling at least one of following USEflags:' ewarn ' gtk, ncurses, readline.' fi - - if use gnutls && ! use ssl; then - ewarn 'You have enabled USE=3Dgnutls without USE=3Dssl. The SSL suppor= t' - ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.' - fi } =20 src_prepare() { @@ -73,11 +68,11 @@ src_configure() { $(use_enable gtk) $(use_enable ncurses) $(use_enable nntp) + $(use_enable openssl sim) $(use_enable perl) $(use_enable python) $(use_enable readline) $(use_enable rss) - $(use_enable ssl sim) $(use_enable xmpp jabber) =20 $(use_enable !minimal autoresponder) @@ -96,7 +91,7 @@ src_configure() { $(use_with gpm) $(use_with inotify) $(use_with spell aspell) - $(use_with ssl openssl) + $(use_with ssl gnutls) $(use_with zlib) =20 # other magic diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml index 3ca104c..05ef1aa 100644 --- a/net-im/ekg2/metadata.xml +++ b/net-im/ekg2/metadata.xml @@ -10,18 +10,13 @@ Enable Gadu-Gadu protocol support (requires net-libs/libgadu). - Enable SSL/TLS support through GnuTLS - for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will - be preferred where possible (and OpenSSL will be used - elsewhere). Enable jabber message encryption through app-crypt/gpgme. Enable inotify-based filesystem moniotoring sup= port for xmsg&mail plugins. Disable building extra plugins with no addition= al deps. - Enable the complete SSL/TLS support through OpenSSL= . - This also enables the 'sim' plugin which relies on OpenSSL. + Support encryption in sim plugin, using OpenSSL= . Support logging messages into SQLite3 database. If 'sqlite' is set too, SQLite3 will be used. Support logging messages into SQLite2 database.