Add cli in 2.2.4, fix cli usage in 9999, thank Nikoli for this job.

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

diff --git a/net-p2p/eiskaltdcpp/ChangeLog b/net-p2p/eiskaltdcpp/ChangeLog
index 28e5b16fcd267f5592df7b3df0463081af9269aa..236f6ca0afdce4b6fd3bd97a10a4cf36956684d4 100644 (file)
--- a/net-p2p/eiskaltdcpp/ChangeLog
+++ b/net-p2p/eiskaltdcpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/eiskaltdcpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.33 2011/10/19 08:13:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/ChangeLog,v 1.34 2011/10/19 19:50:45 pva Exp $
+
+  19 Oct 2011; Peter Volkov <pva@gentoo.org> eiskaltdcpp-2.2.4.ebuild,
+  eiskaltdcpp-9999.ebuild:
+  Add cli in 2.2.4, fix cli usage in 9999, thank Nikoli for this job.
 
   19 Oct 2011; Peter Volkov <pva@gentoo.org> eiskaltdcpp-9999.ebuild:
   dev-perl/Term-ShellUI is in the tree, cli is back. Thank Nikoli for this job.

diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index e6d75661d6b44ba15331b6119b53b31e61171ac2..4f4d74d396fd6e9bdc9521e31070a4b3ff875686 100644 (file)
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -8,14 +8,14 @@ DIST eiskaltdcpp-2.2.4.tar.xz 2008920 RMD160 7e27c1bd8b749283d2d887b3b3670c267c7
 EBUILD eiskaltdcpp-2.2.1.ebuild 2567 RMD160 164067e24486b9b7f7e582888bf7c724c108596a SHA1 6bce31e3d71a640110ab19bc68fed6eed108fd99 SHA256 cf89258d8f85aeed3eaad1517222d0551b636a14067f2142c4fe7d2a5d9b8532
 EBUILD eiskaltdcpp-2.2.2.ebuild 2900 RMD160 a03f80e192ed92a13a8547b980dad2439f34dc2e SHA1 9e75b1829ed521e08b56396fca39f6a526673068 SHA256 5a0301da85d190883306755db2ef28600b9c3c93359d1f4e9a78fdb1205091fc
 EBUILD eiskaltdcpp-2.2.3.ebuild 2833 RMD160 cfb4e634c6b87f96d0374ac1c5b364c3f754572f SHA1 60cf1a3b1699f6b6111f416708f0710f0d83a276 SHA256 143bd2dbbf2b9523a292ccde5efe78bd6dfd976af05d9a2684c70a69ad7b11e6
-EBUILD eiskaltdcpp-2.2.4.ebuild 3203 RMD160 3014150e44178d604a9f7ab02ed34c80a9dba636 SHA1 13cf7dfe028ced4fe04de3db48469fc3902a506b SHA256 24387b5a82e305cec1e65000cbe53ff524bb120976c41ba021eaca031bffecdb
-EBUILD eiskaltdcpp-9999.ebuild 3295 RMD160 b1e9628788ce301bb1b32b3d38c838c97f3be2c2 SHA1 4dabcdef34da9599e4eb84cd185e791c5b51066c SHA256 ff239f3efebff6f0c03e59f25596ac4057251efe64bc7e3d760c91094cc7944a
-MISC ChangeLog 5846 RMD160 2d07e78847802152755680d85f8fe8fc1d2c51e9 SHA1 a104fcf2d46d4968227c5c799c3e6b1abbc9b3c7 SHA256 0c5f58fc7f234bc220a092cf6aaa637f064aad735e1fe2e2f72c28a396e864af
+EBUILD eiskaltdcpp-2.2.4.ebuild 3303 RMD160 d74333764ba7bf69efd9974061de3cf6148db7be SHA1 2635e6d3c5b4d2e2032095c3317e2b09a4bfb58b SHA256 fb2a563333a8820456700df43b9fa5ea854411ac32a94ee5e017b1e6ae96e1ed
+EBUILD eiskaltdcpp-9999.ebuild 3303 RMD160 dc7c83838597094fb545698c52b18564f786e975 SHA1 0537663cc25fe007007c1b50b5569a4859df3b62 SHA256 a25d0da5470a2f4b36a278da662ed41eacbd17d6e97bffd39a21f76add065f84
+MISC ChangeLog 6015 RMD160 614156545c34c4cee3228ad597e575805ceddaa8 SHA1 6db9814f61bc1be55419faae0d949fd7129abdd8 SHA256 d6e26b01fb13f523dbf476d59b9ab10ec86f33855c7731d46045ae5af08f081d
 MISC metadata.xml 1057 RMD160 6b3d98e5b1d35fd231ccbdf7f006f2840053fca5 SHA1 8c43cea56c16a5871617c4f62c8b87884a3e5c8a SHA256 f148a2ba2035325cb6ffe349d6b066e87a22a106620795919dafa83554634055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6ehjsACgkQGrk+8vGYmweAyQD/W/S/6/0QlLyHdYLajQCbofTX
-JrPgXA6gDdKKN/1ZXfUA+QGiZReGuQSSnv+z5YsuKjPdXKd0E2C3pyUxWCb0aXSB
-=UvNE
+iF4EAREIAAYFAk6fKaoACgkQGrk+8vGYmwfGvwD+JRyi8odEfdw3abEqQfqqc3SD
+Uloz3Dv0o3IE65z2U30A/1ZiX/ANxll1woueJJlGcxhd1IcdBJstRI9Pk2HduQhj
+=YWsn
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild
index c8f9b789fc9dd8d5c2f2aa77eebf14061502f75b..2fb7a66493ca0722b61449c14c3749e654c8b375 100644 (file)
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.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-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild,v 1.1 2011/10/08 15:49:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.4.ebuild,v 1.2 2011/10/19 19:50:45 pva Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://eiskaltdc.googlecode.com/"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-IUSE="daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
+IUSE="cli daemon dbus +dht +emoticons examples -gnome -gtk idn -javascript libnotify lua +minimal pcre +qt4 sound spell sqlite upnp xmlrpc"
 for x in ${LANGS}; do
        IUSE="${IUSE} linguas_${x}"
 done
@@ -49,10 +49,15 @@ RDEPEND="
        lua? ( >=dev-lang/lua-5.1 )
        pcre? ( >=dev-libs/libpcre-4.2 )
        upnp? ( net-libs/miniupnpc )
+       cli? (
+               >=dev-lang/perl-5.10
+               dev-perl/RPC-XML
+               dev-perl/Term-ShellUI
+       )
        daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
        gtk? (
                x11-libs/pango
-               >=x11-libs/gtk+-2.24:2
+               >=x11-libs/gtk+-2.18:2
                >=dev-libs/glib-2.18:2
                x11-themes/hicolor-icon-theme
                gnome? ( gnome-base/libgnome )
@@ -93,6 +98,7 @@ src_configure() {
                -DLIB_INSTALL_DIR="$(get_libdir)"
                -Dlinguas="${langs}"
                -DLOCAL_MINIUPNP=OFF
+               "$(cmake-utils_use cli USE_CLI)"
                "$(cmake-utils_use daemon NO_UI_DAEMON)"
                "$(cmake-utils_use dbus DBUS_NOTIFY)"
                "$(cmake-utils_use dht WITH_DHT)"
@@ -113,7 +119,6 @@ src_configure() {
                "$(cmake-utils_use sqlite USE_QT_SQLITE)"
                "$(cmake-utils_use upnp USE_MINIUPNP)"
                "$(cmake-utils_use xmlrpc XMLRPC_DAEMON)"
-               -DUSE_CLI=OFF
        )
        cmake-utils_src_configure
 }

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 79b7ae26c2fa9f12c9034b490b6573bf6d35d394..388e08c3f32aae07732d6f02724940fafbd4c388 100644 (file)
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.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-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.25 2011/10/19 08:13:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild,v 1.26 2011/10/19 19:50:45 pva Exp $
 
 EAPI="4"
 
@@ -98,7 +98,7 @@ src_configure() {
                -DLIB_INSTALL_DIR="$(get_libdir)"
                -Dlinguas="${langs}"
                -DLOCAL_MINIUPNP=OFF
-               "$(cmake-utils_use cli)"
+               "$(cmake-utils_use cli USE_CLI)"
                "$(cmake-utils_use daemon NO_UI_DAEMON)"
                "$(cmake-utils_use dbus DBUS_NOTIFY)"
                "$(cmake-utils_use dht WITH_DHT)"